重新抓调拨节点

AutoTurnOver.DB/daily.cs

@@ -1616,7 +1616,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
                 sql = @"
 select 
 
-sum(ifnull(t2.deliverycount - t2.storagecount,0)) as 'not_storage',
+sum(ifnull(t2.deliverycount - t2.storagecount,0)) as 'not_storage'
 
 
 from dc_base_transfer_info as t1
@@ -1626,7 +1626,6 @@ left join dc_base_sku as t4 on t2.sku = t4.bailun_sku
 left join dc_base_stock as t5 on t2.sku = t5.bailun_sku and t1.targetwareno = t5.warehouse_code
 left join dc_auto_turnover as t6 on  t2.sku = t6.bailun_sku and t1.targetwareno = t6.warehouse_code
 left join dc_auto_forecast_fluctuation as t7 on t2.sku = t7.bailun_sku and t1.targetwareno = t7.warehouse_code
-left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and t2.sku = t8.sku
 
 ";
                 if ((categoryModels != null && categoryModels.Count >= 1) || !string.IsNullOrWhiteSpace(search_data.buyer_name) || search_data.product_type > 0)
@@ -1642,7 +1641,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.warehouse_code = t10.warehouse_code ";
                 }
 
-                sql += "  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 ";
             }
             else
             {
@@ -1664,7 +1663,7 @@ t7.type as 'forecast_type',
 
 t1.`code` as 'order_no',
 t1.transporttype,
-t1.dataid,
+t1.stateid,
 
 t8.trackingno,
 t8.transfer_no,
@@ -1721,7 +1720,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 += "  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 ";
 
 
 
@@ -1832,6 +1831,11 @@ left join dc_base_stock as t5 on t2.sku = t5.bailun_sku and t1.targetwareno = t5
                         countSql += " and t4.product_inner_code = @product_inner_code ";
                         parameters.Add("product_inner_code", $"{search_data.key_words}");
                         break;
+                    case 6:
+                        sql += " and t1.code = @sys_order_code ";
+                        countSql += " and t1.code = @sys_order_code ";
+                        parameters.Add("sys_order_code", $"{search_data.key_words}");
+                        break;
                 }
 
             }

AutoTurnOver.DB/dc_base_transfer_extend_dao.cs

@@ -87,7 +87,7 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To
         /// </summary>
         public static void SynchroLmsTransferOrder()
         {
-            var task_name = "SynchroLmsTransferOrder_v6";
+            var task_name = "SynchroLmsTransferOrder_v7";
             var conn = _connection;
             // 查询最后一次成功抓取的记录
             var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select  * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });
@@ -142,7 +142,9 @@ where t1.stateid!=5 and t1.isdeleted=0 and t2.deliverycount>t2.storagecount").To
                        logistics_name = item.logistics_name ?? "",
                        expectarrivaltime = item.expectarrivaltime,
                        surplus_node_days=item.surplus_node_days,
-                        sys_update_date = DateTime.Now
+                        sys_update_date = DateTime.Now,
+                        quantity = item.quantity,
+                        storage_count  = item.storage_count
                     };
 
                     db_data.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_lms_order_transfer_current_node where `data_id`=@data_id and  box_id=@box_id and sku=@sku ", new

AutoTurnOver.Models/ApiDto/api_order_transfer_current_node_dto.cs

@@ -39,6 +39,8 @@ namespace AutoTurnOver.Models.ApiDto
             public int sign_exe { get; set; }
             public decimal? surplus_node_days { get; set; }
             public DateTime? expectarrivaltime { get; set; }
+            public int quantity { get; set; }
+            public int storage_count { get; set; }
         }
         
     }

AutoTurnOver.Models/dc_lms_order_transfer_current_node.cs

@@ -26,5 +26,7 @@ namespace AutoTurnOver.Models
         public decimal? surplus_node_days { get; set; }
         public DateTime? expectarrivaltime { get; set; }
         public DateTime sys_update_date { get; set; }
+        public int quantity { get; set; }
+        public int storage_count { get; set; }
     }
 }

AutoTurnOver.Models/order_transfer_full_link_dto.cs

@@ -7,7 +7,7 @@ namespace AutoTurnOver.Models
     /// <summary>
     /// 调拨在途全链路监控
     /// </summary>
-   public class order_transfer_full_link_dto
+    public class order_transfer_full_link_dto
     {
         public string sku { get; set; }
         public string warehouse_code { get; set; }
@@ -43,7 +43,25 @@ namespace AutoTurnOver.Models
         }
         public string order_no { get; set; }
         public string transporttype { get; set; }
-        public string dataid { get; set; }
+        public int? stateid { get; set; }
+        public string state_str
+        {
+            get
+            {
+                if (stateid == null)
+                {
+                    return "未知";
+                }
+                else
+                {
+                    return ((state_enum)stateid).ToString();
+                }
+            }
+        }
+        public enum state_enum
+        {
+            创建 = 0, 打包 = 1, 交运 = 2, 确认 = 3, 在途 = 4, 完成 = 5
+        }
 
         public string trackingno { get; set; }
         public string transfer_no { get; set; }
@@ -52,7 +70,7 @@ namespace AutoTurnOver.Models
         public string node_name { get; set; }
         public DateTime? expectarrivaltime { get; set; }
         public decimal? surplus_node_days { get; set; }
-        public decimal? node_expectarrivaltime { get; set; }
+        public DateTime? node_expectarrivaltime { get; set; }
         public string logistics_code { get; set; }
         public string logistics_name { get; set; }
     }

AutoTurnOver.Services/DailyServices.cs

@@ -649,7 +649,7 @@ namespace AutoTurnOver.Services
                         row["物流跟踪号"] = itemData.trackingno;
                         row["物流转单号"] = itemData.transfer_no;
                         row["头程方式"] = itemData.transporttype;
-                        row["调拨单状态"] = itemData.dataid;
+                        row["调拨单状态"] = itemData.state_str;
                         row["物流渠道"] = itemData.logistics_name;
                         row["物流渠道编码"] = itemData.logistics_code;
                         row["物流节点状态"] = itemData.node_name;