新增时间节点

AutoTurnOver.DB/daily.cs

@@ -1962,6 +1962,45 @@ left join dc_base_stock as t5 on t2.sku = t5.bailun_sku and t1.targetwareno = t5
             }
             return obj;
         }
+
+        /// <summary>
+        /// 暂存调拨单列表
+        /// </summary>
+        public static List<dc_base_trans_temp_schedule_dto> TempTransferList(temp_transfer_order_search_dto search, ref int total)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            string sql = " select * from dc_base_trans_temp_schedule as t1 where t1.is_delete=0 and t1.is_temp_data=1 and   t1.is_exception=0 ";
+            string countSql = " select count(1) from dc_base_trans_temp_schedule as t1 where t1.is_delete=0 and t1.is_temp_data=1 and   t1.is_exception=0";
+            if (!string.IsNullOrWhiteSpace(search.bailun_sku))
+            {
+                sql += " and t1.sku=@bailun_sku ";
+                countSql += " and t1.sku=@bailun_sku ";
+                parameters.Add("bailun_sku",search.bailun_sku);
+            }
+            if (!string.IsNullOrWhiteSpace(search.target_ware_no))
+            {
+                sql += " and t1.target_ware_no=@target_ware_no ";
+                countSql += " and t1.target_ware_no=@target_ware_no ";
+                parameters.Add("target_ware_no", search.target_ware_no);
+            }
+            if (search.type == 1)
+            {
+                sql += " and t1.create_state=@create_state ";
+                countSql += " and t1.create_state=@create_state ";
+                parameters.Add("create_state", (int)dc_base_trans_temp_schedule_create_state_enum.未创建);
+            }
+
+            if (search.type == 2)
+            {
+                sql += " and t1.create_state=@create_state ";
+                countSql += " and t1.create_state=@create_state ";
+                parameters.Add("create_state", (int)dc_base_trans_temp_schedule_create_state_enum.已暂存);
+            }
+            total = _connection.Query<int>(countSql, parameters, commandTimeout: 0).Count();
+            sql += " limit " + search.offset + "," + search.limit;
+            var obj = _connection.Query<dc_base_trans_temp_schedule_dto>(sql, parameters, buffered: false, commandTimeout: 0).AsList();
+            return obj;
+        }
     }
 
 

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -258,6 +258,8 @@ namespace AutoTurnOver.Models.ApiDto
         public string transport_type { get; set; }
         public decimal sign_days { get; set; }
         public decimal put_days { get; set; }
+        public DateTime sign_time { get; set; }
+        public DateTime put_time { get; set; }
     }
 
     public class api_lms_order_transfer_sku_requst_dto

AutoTurnOver.Models/dc_base_trans_temp_schedule.cs

@@ -42,4 +42,23 @@ namespace AutoTurnOver.Models
         已创建 = 2,
         已作废 = 3,
     }
+
+    public  class dc_base_trans_temp_schedule_dto: dc_base_trans_temp_schedule
+    {
+        public int quantity { get
+            {
+                if(create_state== (int)dc_base_trans_temp_schedule_create_state_enum.未创建)
+                {
+                    return product_num;
+                }
+                else if(create_state == (int)dc_base_trans_temp_schedule_create_state_enum.已暂存)
+                {
+                    return temp_delivery_count;
+                }
+                else
+                {
+                    return 0;
+                }
+            } }
+    }
 }

AutoTurnOver.Models/temp_transfer_order_dto.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+    /// <summary>
+    /// 暂存调拨单
+    /// </summary>
+    public class temp_transfer_order_search_dto
+    {
+        public string bailun_sku { get; set; }
+        public string target_ware_no { get; set; }
+
+        public int offset { get; set; }
+        public int limit { get; set; }
+
+        /// <summary>
+        /// 1= 采购临时  2= 调拨暂存
+        /// </summary>
+        public int type { get; set; }
+    }
+}

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -32,7 +32,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //report.ResetTransExpectArrivaltime();
                 //dc_auto_return_goods_config_dao.NewCalculation();
                 //PurchaseAverageTargetServices.Calculation("945333402", days: 360);
-                //PurchaseAverageTargetServices.CalculationTransfer("945333402", 360);
+                PurchaseAverageTargetServices.CalculationTransfer("217632401", 360);
             }
             catch (Exception ex)
             {

AutoTurnOver.Services/DailyServices.cs

@@ -67,6 +67,10 @@ namespace AutoTurnOver.Services
             }
             return DB.daily.FullLinkTransferList(search_data, categoryModels, ref total);
         }
+        public List<dc_base_trans_temp_schedule_dto> TempTransferList(temp_transfer_order_search_dto search_data,ref int total)
+        {
+            return DB.daily.TempTransferList(search_data, ref total);
+        }
 
         public List<dc_base_stock_fba_dto> RealtimeFbaList(dc_base_stock_search_dto search_data,ref int total)
         {

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -344,27 +344,22 @@ namespace AutoTurnOver.Services
                             //warehouse_code = skuItem.warehouse_code,
                             logistics_code = dc_base_head_transport_config_data.logistics_code,
                             country = base_wa
-                        });
+                        }).GroupBy(s=>new { s.order_no,s.logistics_code});
 
-                        if (lmsAvg != null && lmsAvg.Count >= 3)
-                        {
-                            dataWarehouse.transfer_bale_delivery = 1;
-                            dataWarehouse.transfer_delivery = ((lmsAvg.Sum(s => s.sign_days) - lmsAvg.Max(s => s.sign_days) - lmsAvg.Min(s => s.sign_days)) / (lmsAvg.Count - 2));
-                        }
-                        else if (lmsAvg != null && lmsAvg.Count >= 1)
+                        if (lmsAvg != null && lmsAvg.Count() >= 1)
                         {
                             dataWarehouse.transfer_bale_delivery = 1;
-                            dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.sign_days).Average();
+                            dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.FirstOrDefault().sign_days).Average();
                         }
 
-                        if (lmsAvg.Count() >= 3)
+                        if (lmsAvg.Count() >= 3 && false)
                         {
-                            dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.put_days != null).Sum(s => s.put_days) - lmsAvg.Max(s => s.put_days) - lmsAvg.Min(s => s.put_days)) / (lmsAvg.Count - 2));
+                           // dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.put_days != null).Sum(s => s.put_days) - lmsAvg.Max(s => s.put_days) - lmsAvg.Min(s => s.put_days)) / (lmsAvg.Count - 2));
                         }
-                        else if (lmsAvg.Where(s => s.put_days != null).Count() >= 1)
+                        else if (lmsAvg.Count() >= 1)
                         {
 
-                            dataWarehouse.abroad_inbound_delivery = lmsAvg.Where(s => s.put_days != null).Select(s => s.put_days).Average();
+                            dataWarehouse.abroad_inbound_delivery = lmsAvg.Select(s => s.FirstOrDefault().put_days).Average();
                         }
                         else
                         {
@@ -377,7 +372,7 @@ namespace AutoTurnOver.Services
                             bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
                             order_type = "调拨单-平均天数计算"
                         });
-                        if (lmsAvg != null && lmsAvg.Count >= 1)
+                        if (lmsAvg != null && lmsAvg.Count() >= 1)
                         {
                             foreach (var itemLms in lmsAvg)
                             {
@@ -385,15 +380,15 @@ namespace AutoTurnOver.Services
                                 {
                                     bailun_sku = skuItem.bailun_sku,
                                     warehouse_code = skuItem.warehouse_code,
-                                    logistics_code = itemLms.logistics_code,
+                                    logistics_code = itemLms.FirstOrDefault().logistics_code,
                                     bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
                                     bale_days = 1,
-                                    logistics_name = itemLms.logistics_name,
-                                    order_no = itemLms.order_no,
+                                    logistics_name = itemLms.FirstOrDefault().logistics_name,
+                                    order_no = itemLms.Key.order_no,
                                     order_type = "调拨单-平均天数计算",
-                                    put_days = itemLms.put_days,
-                                    sign_days = itemLms.sign_days,
-                                    transport_type = itemLms.transport_type
+                                    put_days = itemLms.FirstOrDefault().put_days,
+                                    sign_days = itemLms.FirstOrDefault().sign_days,
+                                    transport_type = itemLms.FirstOrDefault().transport_type
                                 });
                             }
                         }

AutoTurnOver/Controllers/DailyController.cs

@@ -160,6 +160,33 @@ namespace AutoTurnOver.Controllers
 
         } 
 
+         [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【暂存调拨单】->【搜索】页面", 0)]
+        public JsonResult TempTransferList([FromQuery]temp_transfer_order_search_dto search_data)
+        {
+
+            try
+            {
+                var services = new DailyServices();
+                var total = 0;
+                var list = services.TempTransferList(search_data, ref total);
+
+                return new JsonResult(new
+                {
+                    rows = list,
+                    total = total,
+                });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new
+                {
+                    message = ex.Message,
+                    stack_trace = ex.StackTrace
+                });
+            }
+
+        } 
+
 
         /// 实时库存
         /// </summary>