diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
index acaad592..3bf1c98a 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
@@ -109,10 +109,31 @@ namespace Tnb.ProductionMgr
         private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
         {
             ISqlSugarClient db = _repository.AsSugarClient();
-            Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
+            Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
             string moCode = queryJson.ContainsKey("mo_code") ? queryJson["mo_code"].ToString() : "";
             string moStatus = queryJson.ContainsKey("mo_status") ? queryJson["mo_status"].ToString() : "";
             string combineMoCode = queryJson.ContainsKey("combine_mo_code") ? queryJson["combine_mo_code"].ToString() : "";
+            string mo_type = queryJson.ContainsKey("mo_type") ? queryJson["mo_type"].ToString() : "";
+            string mo_source = queryJson.ContainsKey("mo_source") ? queryJson["mo_source"].ToString() : "";
+            DateTime[] plan_start_date = queryJson.ContainsKey("plan_start_date") ? queryJson["plan_start_date"].ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray() : null;
+            DateTime[] plan_end_date = queryJson.ContainsKey("plan_end_date") ? queryJson["plan_end_date"].ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray() : null;
+            DateTime? s_s_date = null;
+            DateTime? s_e_date = null;
+            DateTime? e_s_date = null;
+            DateTime? e_e_date = null;
+
+            if (plan_start_date != null && plan_start_date.Length == 2)
+            {
+                s_s_date = plan_start_date[0];
+                s_e_date = plan_start_date[1];
+            }
+            
+            if (plan_end_date != null && plan_end_date.Length == 2)
+            {
+                e_s_date = plan_end_date[0];
+                e_e_date = plan_end_date[1];
+            }
+            
             SqlSugarPagedList<PrdMoListOuput> result = await db.Queryable<PrdMo>()
                 .LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
                 .LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == DictConst.MeasurementUnit)
@@ -123,6 +144,10 @@ namespace Tnb.ProductionMgr
                 .WhereIF(!string.IsNullOrEmpty(combineMoCode),
                     (a, b, c, d, e) => a.combine_mo_code.Contains(combineMoCode))
                 .WhereIF(!string.IsNullOrEmpty(moStatus), (a, b, c, d, e) => a.mo_status == moStatus)
+                .WhereIF(!string.IsNullOrEmpty(mo_type), (a, b, c, d, e) => a.mo_type == mo_type)
+                .WhereIF(!string.IsNullOrEmpty(mo_source), (a, b, c, d, e) => a.mo_source == mo_source)
+                .WhereIF(plan_start_date!=null && plan_start_date.Length==2,a=>a.plan_start_date>=s_s_date && a.plan_start_date<=s_e_date)
+                .WhereIF(plan_end_date!=null && plan_end_date.Length==2,a=>a.plan_end_date>=e_s_date && a.plan_end_date<=e_e_date)
                 .Where(a => SqlFunc.IsNullOrEmpty(a.parent_id))
                 .OrderByDescending(a => a.create_time)
                 .Select((a, b, c, d, e, f) => new PrdMoListOuput