fix

AutoTurnOver.DB/ApiUtility.cs

@@ -104,5 +104,45 @@ namespace AutoTurnOver.DB
                 throw new Exception("pps sku 刊登状态接口异常： " + ex.StackTrace);
             }
         }
+
+        /// <summary>
+        /// 获取预估物流费用
+        /// </summary>
+        /// <returns></returns>
+        public static api_logistic_query_result_dto.line_dto GetFilterLogisticsAssignLine(api_logistic_query_input_dto data)
+        {
+            try
+            {
+                var parameter_str = $"?LineCodes={data.LineCodes}";
+                parameter_str += $"endCountries={data.endCountries}";
+                parameter_str += $"Long={data.Long}";
+                parameter_str += $"width={data.width}";
+                parameter_str += $"high={data.high}";
+                parameter_str += $"weightKg={data.weightKg}";
+                parameter_str += $"startPoint={data.startPoint}";
+                parameter_str += $"warehouseNo={data.warehouseNo}";
+                //parameter_str += $"orderPriceCNY={data.orderPriceCNY}";
+                parameter_str += $"platform={data.platform}";
+                parameter_str += $"Site={data.Site}";
+
+                //查询采购建议明细 
+                string url = ConfigHelper.GetValue("ApiLogisticsGetFilterLogisticsAssignLine");
+                string resultStr = HttpHelper.Request(url, RequestType.GET, parameter_str, timeout: 1000 * 60 * 60 * 24);
+                var result = resultStr.ToObj<api_logistic_query_result_dto>();
+                if (result == null || result.successLines == null || result.successLines.Count <= 0)
+                {
+                    throw new Exception("未查询到物流费用");
+                }
+                else
+                {
+                    return result.successLines[0];
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(" lms 接口异常： " + ex.Message);
+                throw new Exception(" lms 接口异常： " + ex.StackTrace);
+            }
+        }
     }
 }

AutoTurnOver.DB/dc_auto_forecast_fluctuation.cs

@@ -33,7 +33,8 @@ t2.history_fourteenday_sales,
 t2.history_thirtyday_sales,
 ( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status',
 t6.usable_stock,
-t3.moq
+t3.moq,
+t6.`character`
 from
 dc_auto_forecast_fluctuation as t1
 inner JOIN dc_auto_turnover as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
@@ -66,6 +67,11 @@ where 1 = 1
                 sql += " and t1.bailun_sku=@bailun_sku ";
                 parameters.Add("bailun_sku", data.sku);
             }
+            if (!string.IsNullOrWhiteSpace(data.character))
+            {
+                sql += " and t1.bailun_sku=@bailun_sku ";
+                parameters.Add("character", data.character);
+            }
             if (!string.IsNullOrWhiteSpace(data.warehouse_code))
             {
                 sql += " and t1.warehouse_code=@warehouse_code ";

AutoTurnOver.DB/report.cs

@@ -1756,7 +1756,38 @@ truncate table dc_base_sku_sum_temp;
 
 ", commandTimeout: 0);
 
+                _connection.Execute(@" -- 刷新 数据特性
+set session transaction isolation level read uncommitted;
+start transaction;
+
+-- 清空视图表的数据
+Truncate table dc_base_data_character_temp;
+
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
+select '无库' as 'character',bailun_sku,warehouse_code from dc_base_stock where warehouse_code in ('BLGZ03','YWWH01');
+
+	
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
+select '自产' as 'character',t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_sku as t2 on t1.bailun_sku  =t2.bailun_sku where t2.buyer_name in ('张莹霞','张莹霞1');
+	
+insert into dc_base_data_character_temp(`character`,  `bailun_sku`,  `warehouse_code`)
+select '海外仓' as 'character',t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where t2.hq_type not in ('国内仓');
+
+	
+alter table dc_base_data_character rename dc_base_data_characterTemp; 
+alter table dc_base_data_character_temp rename dc_base_data_character; 
+alter table dc_base_data_characterTemp rename dc_base_data_character_temp; 
+truncate table dc_base_data_character_temp; 
 
+update dc_base_stock as t1,
+ (
+select bailun_sku,warehouse_code,GROUP_CONCAT(`character`) as 'character' from dc_base_data_character GROUP BY bailun_sku,warehouse_code
+) as t2
+set t1.`character` = t2.`character`
+where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
+
+
+", commandTimeout: 0);
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -985,6 +985,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                 data_type == (int)dc_report_cash_flow_log_data_type_enum.利润 
                 || data_type == (int)dc_report_cash_flow_log_data_type_enum.释放头程费用 
                 || data_type == (int)dc_report_cash_flow_log_data_type_enum.释放销售成本 
+                || data_type == (int)dc_report_cash_flow_log_data_type_enum.销售数量 
                 )
             {
                 data_type = (int)dc_report_cash_flow_log_data_type_enum.销售金额;

AutoTurnOver.Models/ApiDto/api_logistic_query_input_dto.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.ApiDto
+{
+    public class api_logistic_query_input_dto
+    {
+        /// <summary>
+        /// (必传)目的国家
+        /// </summary>
+        public string endCountries { get; set; }
+        /// <summary>
+        /// 站点
+        /// </summary>
+        public string Site { get; set; }
+        /// <summary>
+        /// (必传)长 
+        /// </summary>
+        public decimal Long { get; set; }
+        /// <summary>
+        /// (必传)宽
+        /// </summary>
+        public decimal width { get; set; }
+        /// <summary>
+        /// (必传)高
+        /// </summary>
+        public decimal high { get; set; }
+        /// <summary>
+        /// (必传)重量kg
+        /// </summary>
+        public decimal weightKg { get; set; }
+        /// <summary>
+        /// 邮编 传入则匹配
+        /// </summary>
+        //public string enterZip { get; set; } = "";
+        /// <summary>
+        /// 发货地 1-直邮 2-海外 3-头程
+        /// </summary>
+        public string startPoint { get; set; } = "";
+        /// <summary>
+        /// 邮递方式 1-小包平邮 2-小包挂号 3-快递 4-专线平邮 5-海外 6-调拨 7-专线挂号
+        /// </summary>
+        //public string postWay { get; set; } = "";
+        /// <summary>
+        /// 运输规定时间
+        /// </summary>
+        //public decimal theAging { get; set; } = 0;
+        /// <summary>
+        /// 指定平台
+        /// </summary>
+        public string platform { get; set; } = "";
+        /// <summary>
+        /// 货物性质,传入时需要数字
+        /// </summary>
+        //public string electrifiedType { get; set; } = "";
+
+        /// <summary>
+        /// 物流渠道编码
+        /// </summary>
+        //public string LogisticsCode { get; set; } = "";
+
+        /// <summary>
+        /// 官方物流编码
+        /// </summary>
+        //public string OfficeLogistic { get; set; } = "";
+
+        /// <summary>
+        /// 指定线路 多个则需要使用 , 分割
+        /// </summary>
+        //public string MainLineIds { get; set; }
+
+        /// <summary>
+        /// 指定线路Line_Code 多个则需要使用 , 分割
+        /// </summary>
+        public string LineCodes { get; set; } = "";
+        /// <summary>
+        /// 仓库Id  
+        /// </summary>
+       // public int warehouseId { get; set; } = 0;
+
+        /// <summary>
+        /// 仓库编码No
+        /// </summary>
+        public string warehouseNo { get; set; }
+
+        /// <summary>
+        /// sku信息 以  ,  分割 如已传长宽高重量 可不传 
+        /// </summary>
+        //public string skus { get; set; } = "";
+
+        /// <summary>
+        /// 该票订单总金额 用于计算是否超过申报价值上限
+        /// </summary>
+        //public decimal orderPriceCNY { get; set; } = 0;
+
+        /// <summary>
+        /// 销售金额
+        /// </summary>
+       // public decimal SellMoney { get; set; } = 0;
+
+        /// <summary>
+        /// 查询禁用渠道
+        /// </summary>
+        //public bool isIgnoreAbandon { get; set; } = false;
+
+        /// <summary>
+        /// 查询失败渠道
+        /// </summary>
+        //public bool IsFails { get; set; } = false;
+
+        /// <summary>
+        /// 使用历史时间计算费用和可发国家
+        /// </summary>
+        //public DateTime? HistoryTime { get; set; }
+
+        /// <summary>
+        /// 0-不限 1-线下渠道 2-线上渠道
+        /// </summary>
+        //public int OnLineType { get; set; }
+
+        /// <summary>
+        /// 是否忽略泡重 0不忽略  1忽略
+        /// </summary>
+        //public bool isIgnoreVolumeWeight { get; set; } = true;
+
+        //public string HeadType { get; set; } = "";
+    }
+
+    public class api_logistic_query_result_dto
+    {
+        public bool Success { get; set; }
+        public string ErrorMessage { get; set; }
+        public string Data { get; set; }
+
+        public List<line_dto> successLines { get; set; }
+
+        public class line_dto
+        {
+            public string Line_Code { get; set; }
+            public string LineName { get; set; }
+            public decimal FootFee { get; set; }
+            public decimal HeadFee { get; set; }
+            public string ErrorMsg { get; set; }
+
+            /// <summary>
+            /// 最快
+            /// </summary>
+            public decimal FastAging { get; set; }
+            /// <summary>
+            /// 最慢
+            /// </summary>
+            public decimal SlowAging { get; set; }
+        }
+
+    }
+}

AutoTurnOver.Models/Report/dc_report_cash_flow_forecast_task.cs

@@ -12,13 +12,18 @@ namespace AutoTurnOver.Models.Report
         public int id { get; set; }
         public string bailun_sku { get; set; }
         public string warehouse_code { get; set; }
+        public string warehouse_type { get; set; }
         public string platform_type { get; set; }
         public string web_site { get; set; }
         /// <summary>
-        /// 供应商交期
+        /// 采购供应商交期
         /// </summary>
         public int delivery { get; set; }
         /// <summary>
+        /// 调拨交期
+        /// </summary>
+        public int transfer_days { get; set; }
+        /// <summary>
         /// 运输方式 -1 = 无 1 = 陆运 2 = 海运 3 = 空运
         /// </summary>
         public int transport_type { get; set; }
@@ -65,6 +70,10 @@ namespace AutoTurnOver.Models.Report
         public string step { get; set; }
         public string error_message { get; set; }
         public string error_stack_trace { get; set; }
+        public decimal high { get; set; }
+        public decimal @long { get; set; }
+        public decimal weight_kg { get; set; }
+        public decimal width { get; set; }
 
 
     }
@@ -142,6 +151,7 @@ namespace AutoTurnOver.Models.Report
     public class invented_turnover_model
     {
         public DateTime date { get; set; }
+        public string date_str { get { return date.ToString("yyyy-MM-dd"); } }
 
         /// <summary>
         /// 预测数值
@@ -157,9 +167,15 @@ namespace AutoTurnOver.Models.Report
 
         public enum type_enum
         {
-            预测可用库存  =1,
-            预测采购数量 = 2,
-            最终采购数量  =3
+            入库数量 = 1,
+            采购数量 = 2,
+            最终采购数量 = 3,
+            销量 = 4,
+            可用库存 = 5,
+            /// <summary>
+            /// 采购中转仓入库之后，下调拨单
+            /// </summary>
+            调拨下单 = 6
         }
     }
 

AutoTurnOver.Models/dc_auto_forecast_fluctuation.cs

@@ -90,6 +90,7 @@ namespace AutoTurnOver.Models
         public int purchase_advise_count { get; set; }
 
         public string sku_title_cn { get; set; }
+        public string character { get; set; }
 
         /// <summary>
         /// 采购在途
@@ -155,6 +156,7 @@ namespace AutoTurnOver.Models
         public string warehouse_code { get; set; }
 
         public string warehousetype { get; set; }
+        public string character { get; set; }
 
         public int? warehousearea { get; set; }
         /// <summary>

AutoTurnOver.Purchase.AverageTarget/appsettings.dev.json

@@ -2,5 +2,6 @@
   "ConnectionStrings": {
     "Default": "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
   },
-  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus"
+  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus",
+  "ApiLogisticsGetFilterLogisticsAssignLine": "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine"
 }

AutoTurnOver.Purchase.AverageTarget/appsettings.json

@@ -2,5 +2,6 @@
   "ConnectionStrings": {
     "Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
   },
-  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus"
+  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus",
+  "ApiLogisticsGetFilterLogisticsAssignLine": "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine"
 }

AutoTurnOver.Purchase.AverageTarget/appsettings.prod.json

@@ -2,5 +2,6 @@
   "ConnectionStrings": {
     "Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
   },
-  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus"
+  "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus",
+  "ApiLogisticsGetFilterLogisticsAssignLine": "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine"
 }
\ No newline at end of file

AutoTurnOver/Controllers/ExceptionReminderController.cs

@@ -17,7 +17,7 @@ namespace AutoTurnOver.Controllers
     {
         [HttpGet]
         [UseAction]
-        public JsonResult List(int limit, int offset, string order, string sort, string sku, string warehousecode, string warehousetype, int? warehousearea,
+        public JsonResult List(int limit, int offset, string order, string sort, string sku, string character, string warehousecode, string warehousetype, int? warehousearea,
             bool? has_overdue = null, bool? has_confirm = null, bool? has_solve = null,int? err_type = null)
         {
             var m = new dc_auto_forecast_fluctuation_search_dto
@@ -29,7 +29,8 @@ namespace AutoTurnOver.Controllers
                 has_solve = has_solve,
                 warehousetype = warehousetype,
                 warehousearea = warehousearea,
-                err_type = err_type
+                err_type = err_type,
+                character = character
             };
 
             var total = 0;