焊工 入场 离场 日报导入 装置排序

SGGL/BLL/HJGL/PersonManage/WelderService.cs

@@ -1,4 +1,5 @@
 using Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.UI.WebControls;
@@ -74,8 +75,9 @@ namespace BLL
             newWelder.AttachUrl = welder.AttachUrl;
             newWelder.JOT_Sch = welder.JOT_Sch;
             newWelder.Steels = welder.Steels;
+            newWelder.InTime = welder.InTime;
+            newWelder.OutTime = welder.OutTime;
 
-            
             Funs.DB.BS_Welder.InsertOnSubmit(newWelder);
             Funs.DB.SubmitChanges();
         }
@@ -108,6 +110,8 @@ namespace BLL
                 newWelder.SE_EquipmentID = welder.SE_EquipmentID;
                 newWelder.WederType = welder.WederType;
                 newWelder.WED_TYPE = welder.WED_TYPE;
+                newWelder.InTime = welder.InTime;
+                newWelder.OutTime = welder.OutTime;
 
                 newWelder.RTIdentityCard = welder.RTIdentityCard;
                 newWelder.RTQualifiedLevel = welder.RTQualifiedLevel;
@@ -297,6 +301,7 @@ namespace BLL
         {
             var q = from x in Funs.DB.BS_Welder
                     where x.ProjectId == projectId && x.WED_Unit == unitId && x.WED_IfOnGuard == true
+                    where !x.OutTime.HasValue || x.OutTime>DateTime.Now
                     orderby x.WED_Code
                     select new
                     {

SGGL/BLL/ProjectData/Project_InstallationService.cs

@@ -99,6 +99,7 @@ namespace BLL
             newIns.Weights = installation.Weights;
             newIns.WeightsMoney = installation.WeightsMoney;
             newIns.Def = installation.Def;
+            newIns.SortIndex = installation.SortIndex;
 
             db.Project_Installation.InsertOnSubmit(newIns);
             db.SubmitChanges();