Browse Source

机具列表循环开始时间

lichunlei 3 năm trước cách đây
mục cha
commit
06f44390d6

+ 9 - 2
Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -203,8 +203,15 @@ namespace MySystem.Areas.Admin.Controllers
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))
                 {
-                    var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
-                    dic["RecycStartDate"] = RecycStartDate;
+                    // var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
+                    // dic["RecycStartDate"] = RecycStartDate;
+                    string PosSn = dic["PosSn"].ToString();
+                    bool op = db.StoreChangeHistory.Any(m => m.SnNo == PosSn && m.TransType == 2);
+                    if(op)
+                    {
+                        StoreChangeHistory item = db.StoreChangeHistory.FirstOrDefault(m => m.SnNo == PosSn && m.TransType == 2) ?? new StoreChangeHistory();
+                        dic["RecycStartDate"] = item.ToDate == null ? "" : item.ToDate.Value.ToString("yyyy-MM-dd");
+                    }
                 }
 
                 //实际押金