增加是否成品字段

Bailun.DC.Models/dc_daily_purchase_sales.cs

@@ -118,5 +118,11 @@ namespace Bailun.DC.Models
         /// 百伦简单分类
         /// </summary>
         public string category_simple_name { get; set; }
+
+        /// <summary>
+        /// 是否成品  1：成品  0：半成品
+        /// </summary>
+        public int isfinish { get; set; }
+
     }
 }

Bailun.DC.SkuDailyPurchaseAndSales/Services.cs

@@ -165,6 +165,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
                         diff_putin_count = 0,
                         stock_start = 0,
                         stockamount_start = 0,
+                        isfinish = 1,
                     };
 
                     //期末
@@ -239,7 +240,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
             
             cn.Execute("delete from dc_daily_purchase_sales where day='" + day.ToString("yyyy-MM-dd") + "'");
 
-            var sql = "insert dc_daily_purchase_sales (day,warehouse_code,warehouse_name,bailun_sku,count_sales,amount_sales,count_purchase,amount_purchase,difference_count,difference_amount,createtime,stock_start,stockamount_start,stock_end,stockamount_end,count_putin,amount_putin,diff_putin_count,diff_putin_amount,count_shipping,amount_shipping) values ";
+            var sql = "insert dc_daily_purchase_sales (day,warehouse_code,warehouse_name,bailun_sku,count_sales,amount_sales,count_purchase,amount_purchase,difference_count,difference_amount,createtime,stock_start,stockamount_start,stock_end,stockamount_end,count_putin,amount_putin,diff_putin_count,diff_putin_amount,count_shipping,amount_shipping,isfinish) values ";
             var str = "";
             var index = 0;
             var pagesize = 5000;
@@ -248,7 +249,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
             while (index < list.Count)
             {
                 var m = list[index];
-                str += $"('{m.day.ToString("yyyy-MM-dd")}','{m.warehouse_code}','{m.warehouse_name}','{m.bailun_sku}',{m.count_sales},'{m.amount_sales}','{m.count_purchase}','{m.amount_purchase}','{m.difference_count}','{m.difference_amount}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.stock_start},{m.stockamount_start},{m.stock_end},{m.stockamount_end},{m.count_putin},{m.amount_putin},{m.diff_putin_count},{m.diff_putin_amount},{m.count_shipping},{m.amount_shipping}),";
+                str += $"('{m.day.ToString("yyyy-MM-dd")}','{m.warehouse_code}','{m.warehouse_name}','{m.bailun_sku}',{m.count_sales},'{m.amount_sales}','{m.count_purchase}','{m.amount_purchase}','{m.difference_count}','{m.difference_amount}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.stock_start},{m.stockamount_start},{m.stock_end},{m.stockamount_end},{m.count_putin},{m.amount_putin},{m.diff_putin_count},{m.diff_putin_amount},{m.count_shipping},{m.amount_shipping},{m.isfinish}),";
 
                 if ((index + 1) % pagesize == 0)
                 {

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -3493,6 +3493,22 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 发生额明细
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// 
+        /// <param name="type">类型</param>
+        /// <returns></returns>
+        public string ListHappenAmountJson(DateTime start, DateTime end,string categorytype,int type)
+        {
+
+
+
+            return "";
+        }
+        
 
 
         #endregion