优化

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("5.4.2024.6270")]
+[assembly: AssemblyFileVersion("5.4.2024.6270")]

Src/RestfulPlan.cs

@@ -97,7 +97,9 @@ namespace Kivii.Third.Scjgj
                     if (Take.HasValue && Take.Value > 0) query.Take(Take.Value);
                     if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
                     var results = conn.Select(query);
-                    var total = conn.Scalar<PlanDetail, int>(o => Sql.Count(o.ID));
+                    int total = 0;
+                    if (!QueryValues.IsNullOrEmpty()) total = conn.Scalar<PlanDetail, int>(o => Sql.Count(o.ID), o => o.PLAN_CODE.Contains(QueryValues));
+                    else total = conn.Scalar<PlanDetail, int>(o => Sql.Count(o.ID));
                     rtns.Results = results;
                     rtns.Total = total;
                 }
@@ -131,12 +133,12 @@ namespace Kivii.Third.Scjgj
 
         public string PlanNumber { get; set; }//计划批次号LOT_NUM
 
+        public bool ToReport { get; set; }
         public override object OnExecution(IRequest req, IResponse res)
         {
             BatchNumber.ThrowIfNullOrEmpty("请传入计划编号");
             PlanNumber.ThrowIfNullOrEmpty("请传入批次号");
-            var rtns = new RestfulQueryResponse<PlanDetail>();
-            rtns.Results = new List<PlanDetail>();
+            var result = new PlanDetail();
             var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory(Configs.ConnectionString, Configs.ConnectionProviderName);
             using (var conn = factory.OpenDbConnection())
             {
@@ -146,8 +148,8 @@ namespace Kivii.Third.Scjgj
                     query.Where(o => o.PLAN_CODE == BatchNumber && o.LOT_NUM == PlanNumber);
                     var planDetail = conn.Single(query);
                     if (planDetail == null) throw new Exception("未找到此任务单");
-                    var result = planDetail.ConvertTo(conn);
-                    rtns.Results.Add(result);
+                    result = planDetail.DataFilling(conn);
+
                 }
                 catch (Exception ex)
                 {
@@ -155,21 +157,18 @@ namespace Kivii.Third.Scjgj
                 }
 
             }
-            return rtns;
-        }
-    }
-
-    [RequiresAnyRole(MemberRoles.Everyone)]
-    public class PlanDetailConvertToReport : RestfulExecution<PlanDetail>
-    {
-        public PlanDetail Item { get; set; }
-
-        public override object OnExecution(IRequest req, IResponse res)
-        {
-            var rtns = new RestfulReadResponse<Report>();
-            rtns.Result = Item.ConvertTo();
-
-            return rtns;
+            if (!ToReport)
+            {
+                var rtns=new RestfulReadResponse<PlanDetail>();
+                rtns.Result = result;
+                return rtns;
+            }
+            else
+            {
+                var rtns = new RestfulReadResponse<Report>();
+                rtns.Result = result.ConvertTo();
+                return rtns;
+            }
         }
     }
 }