①自产产品，计划单，供应商交期，是否可以 固定，固定资料交期 - 赵鹏

AutoTurnOver.Purchase.AverageTarget/AverageTargetBackgrounService.cs

@@ -37,7 +37,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 try
                 {
                     Console.WriteLine($"开始  init2 ，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                    //PurchaseAverageTargetServices.Calculation(days:(360*3));
+                    PurchaseAverageTargetServices.Calculation(days:(360*3));
                     Console.WriteLine($"结束 init2，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
                 catch (Exception ex)

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -26,12 +26,13 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //report.ResetTransExpectArrivaltime();
                 //PurchaseAverageTargetServices.CalculationTransfer("945333401", days: (360 * 3));
 
-                //PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3)); 
+                //PurchaseAverageTargetServices.Calculation("LM-EO-007", days: (360 * 3)); 
                 //ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "949057402", targetwareno= "MMDUSFBA" });
 
                 //PurchaseAverageTargetServices.SynchroTransferTransportType();
                 //PurchaseAverageTargetServices.CalculationTransfer(days: (360 * 3), has_transfer: true);
                 //dc_base_transfer_freight_dao.CalculationSingle("803597202", "MMDUSFBA");
+                PurchaseAverageTargetServices.Calculation(days: (360 * 3));
             }
             catch (Exception ex)
             {

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -58,8 +58,10 @@ namespace AutoTurnOver.Services
                         bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
                         order_type = "采购单-下单天数计算"
                     });
-                    // 判断是否jit
-                    var has_jit = ((skuItem.buyer_name == "张莹霞" || skuItem.buyer_name == "张莹霞1") && skuItem.warehouse_code == "GZBLWH");
+                    // 判断是否自产
+                    var has_self = ((skuItem.buyer_name == "张莹霞" || skuItem.buyer_name == "张莹霞1"));
+                    // 是否jit （广州02 中转仓不算国内仓）
+                    var has_jit = (has_self && skuItem.hq_type == "国内仓" && skuItem.warehouse_code != "GZBLZZG");
 
                     dc_average_purchase data = new dc_average_purchase()
                     {
@@ -208,9 +210,19 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                         data.virtual_delivery_days = temp_delivery_days;
                         data.payment_type = purchaseList.Any(s => s.pay_type == 1) ? 1 : 2;
 
-                        if (has_jit)
+                        if (has_self)
                         {
-                            data.delivery_days = 3;
+                            if(has_jit)
+                            {
+                                // jit 交期写死3天
+                                data.delivery_days = 3;
+                            }
+                            else
+                            {
+                                // 自产海外仓 读配置
+                                data.delivery_days = (int)Math.Ceiling( WriteConfig(conn, skuItem, data.payment_type, has_jit));
+                            }
+                          
                             data.payment_type = 2; // 先货后款
                         }
 
@@ -223,7 +235,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                     }
                     else
                     {
-                        if (has_jit)
+                        if (has_self)
                         {
                             data.payment_type = 2; // 先货后款
                         }
@@ -268,12 +280,12 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
         }
 
         /// <summary>
-        /// 
+        /// 需要读配置
         /// </summary>
         /// <param name="conn"></param>
         /// <param name="skuItem"></param>
         /// <param name="pay_type">付款方式 1= 先款后货 2 = 先货后款</param>
-        /// <param name="has_jit"></param>
+        /// <param name="has_jit">是否jit</param>
         /// <returns></returns>
         public static decimal WriteConfig(MyMySqlConnection conn, temp_sku_dto skuItem,int pay_type, bool has_jit)
         {
@@ -312,7 +324,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                 bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
                 bale_days = 1,
                 logistics_name = "",
-                order_no = "无有效历史单，读sku的配置",
+                order_no = "读sku的配置",
                 order_type = "采购单-签收天数计算",
                 put_days = 0,
                 sign_days = sku_sign_days,