生产计划加工时字段

SlnMesnac.Model/domain/ProdPLanInfo.cs

@@ -147,5 +147,11 @@ namespace SlnMesnac.Model.domain
         /// </summary>
         [SugarColumn(ColumnName = "import_flag")]
         public string ImportFlag { get; set; }
+
+        /// <summary>
+        /// 工时
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string WorkingHours { get; set; }
     }
 }

SlnMesnac.Model/domain/ProdPlanErpInfo.cs

@@ -0,0 +1,16 @@
+using SqlSugar;
+using System;
+
+namespace SlnMesnac.Model.domain
+{
+    [SugarTable("prod_plan_erp_info"), TenantAttribute("mes")]
+    public class ProdPlanErpInfo
+    {
+        [SugarColumn(ColumnName = "obj_id", IsPrimaryKey = true, IsIdentity = true)]
+        public long ObjId { get; set; } // obj_id
+        [SugarColumn(ColumnName = "seqNo")]
+        public string SeqNo { get; set; } // seqNo
+        [SugarColumn(ColumnName = "workingHours")]
+        public string WorkingHours { get; set; } // workingHours
+    }
+} 

SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs

@@ -28,14 +28,41 @@ namespace SlnMesnac.Repository.service.Impl
         /// <returns></returns>
         public List<ProdPLanInfo> GetRecordStaffAttendancesByConditions(string? orderCode, string? planCode, string? materialCode, string? stationCode, string? planStatus)
         {
-            List<ProdPLanInfo> recordStaffAttendances = new List<ProdPLanInfo>();
+            var query = _rep.Context.Queryable<ProdPLanInfo>()
-            List<ProdPLanInfo> planInfoList = _rep.AsQueryable().WhereIF(!string.IsNullOrEmpty(orderCode), x => x.OrderCode == orderCode)
+                .LeftJoin<ProdPlanErpInfo>((ppi, ppei) => ppi.PlanCode == ppei.SeqNo)
-                .WhereIF(!string.IsNullOrEmpty(planCode), x => x.PlanCode == planCode)
+                .WhereIF(!string.IsNullOrEmpty(orderCode), (ppi, ppei) => ppi.OrderCode == orderCode)
-                .WhereIF(!string.IsNullOrEmpty(materialCode), x => x.MaterialCode == materialCode)
+                .WhereIF(!string.IsNullOrEmpty(planCode), (ppi, ppei) => ppi.PlanCode == planCode)
-                .WhereIF(!string.IsNullOrEmpty(stationCode), x => x.StationCode == stationCode)
+                .WhereIF(!string.IsNullOrEmpty(materialCode), (ppi, ppei) => ppi.MaterialCode == materialCode)
-                .WhereIF(!string.IsNullOrEmpty(planStatus), x => x.PlanStatus == planStatus || x.PlanStatus == "4")
+                .WhereIF(!string.IsNullOrEmpty(stationCode), (ppi, ppei) => ppi.StationCode == stationCode)
-                .OrderByDescending(x => x.ObjId)
+                .WhereIF(!string.IsNullOrEmpty(planStatus), (ppi, ppei) => ppi.PlanStatus == planStatus || ppi.PlanStatus == "4")
-                .ToList();
+                .Select((ppi, ppei) => new ProdPLanInfo
+                {
+                    ObjId = ppi.ObjId,
+                    PlanCode = ppi.PlanCode,
+                    OrderCode = ppi.OrderCode,
+                    MaterialCode = ppi.MaterialCode,
+                    MaterialName = ppi.MaterialName,
+                    StationCode = ppi.StationCode,
+                    TeamCode = ppi.TeamCode,
+                    PlanAmount = ppi.PlanAmount,
+                    CompleteAmount = ppi.CompleteAmount,
+                    BeginTime = ppi.BeginTime,
+                    EndTime = ppi.EndTime,
+                    CompFlag = ppi.CompFlag,
+                    CreatedBy = ppi.CreatedBy,
+                    CreatedTime = ppi.CreatedTime,
+                    UpdatedBy = ppi.UpdatedBy,
+                    UpdatedTime = ppi.UpdatedTime,
+                    DeviceCode = ppi.DeviceCode,
+                    PlanBeginTime = ppi.PlanBeginTime,
+                    PlanEndTime = ppi.PlanEndTime,
+                    PlanStatus = ppi.PlanStatus,
+                    Classes = ppi.Classes,
+                    ProcessCode = ppi.ProcessCode,
+                    ImportFlag = ppi.ImportFlag,
+                    WorkingHours = ppei.WorkingHours
+                });
+            List<ProdPLanInfo> planInfoList = query.ToList();
             return planInfoList;
         }