op行程单部分修改

OASystem/OpWin/Home.cs

@@ -86,7 +86,7 @@ namespace OpWin
                 return;
             }
 
-            Grp_DelegationInfo di = Db.Queryable<Grp_DelegationInfo>().First(x => x.Id == diid);
+            Grp_DelegationInfo di = Db.Queryable<Grp_DelegationInfo>().First(x => x.Id == diid && x.IsDel == 0);
 
             if (di == null)
             {
@@ -135,7 +135,7 @@ namespace OpWin
                     {
                         //出发城市
                         string cityTemp = dtBlack.Rows[i]["Three"].ToString().Replace("/", string.Empty).Substring(0, 3);
-                        t = Db.Queryable<Res_ThreeCode>().First(x => x.Three == cityTemp);
+                        t = Db.Queryable<Res_ThreeCode>().First(x => x.Three == cityTemp && x.IsDel == 0 );
                         if (t != null)
                         {
                             city = city + "/" + t.City;
@@ -149,7 +149,7 @@ namespace OpWin
                         {
                             //抵达城市
                             cityTemp = dtBlack.Rows[i]["Three"].ToString().Replace("/", string.Empty).Substring(3, 3);
-                            t = Db.Queryable<Res_ThreeCode>().First(x => x.Three == cityTemp);
+                            t = Db.Queryable<Res_ThreeCode>().First(x => x.Three == cityTemp && x.IsDel == 0);
                             if (t != null)
                             {
                                 city = city + "/" + t.City;
@@ -218,7 +218,7 @@ namespace OpWin
                 // 行程repeater
                 if (GetByDiid(diid).Count > 0)
                 {
-                    _travelList = GetByDiid(diid).Where(x => x.Issel == 1).ToList();
+                    _travelList = GetByDiid(diid).Where(x => x.Issel == 1 && x.IsDel == 0).ToList();
                 }
                 else
                 {
@@ -504,15 +504,15 @@ namespace OpWin
 
                 //本团车导地接信息
                 //List<CarTouristGuideGroundReservations> listctg = ctgs.GetCarTouristGuideGroundReservationsByDIID(di.Id);
-                List<Grp_CarTouristGuideGroundReservations> listctg = Db.Queryable<Grp_CarTouristGuideGroundReservations>().Where(x => x.DiId == di.Id).ToList();
+                List<Grp_CarTouristGuideGroundReservations> listctg = Db.Queryable<Grp_CarTouristGuideGroundReservations>().Where(x => x.DiId == di.Id && x.IsDel == 0).ToList();
 
                 //本团酒店信息
                 //List<HotelReservations> listht = htrs.GetByDIId(di.Id);
-                List<Grp_HotelReservations> listht = Db.Queryable<Grp_HotelReservations>().Where(x => x.DiId == di.Id).ToList();
+                List<Grp_HotelReservations> listht = Db.Queryable<Grp_HotelReservations>().Where(x => x.DiId == di.Id && x.IsDel == 0).ToList();
 
                 //本团行程单数据
                 //List<Grp_TravelList> listTravel = tls.GetByDiid(di.Id);
-                List<Grp_TravelList> listTravel = Db.Queryable<Grp_TravelList>().Where(x => x.Diid == di.Id).ToList();
+                List<Grp_TravelList> listTravel = Db.Queryable<Grp_TravelList>().Where(x => x.Diid == di.Id && x.IsDel == 0).ToList();
 
                 try
                 {
@@ -4110,7 +4110,7 @@ namespace OpWin
         public DataTable GetTableByBlackCode(int diid)
         {
             //黑屏代码信息
-            List<Air_TicketBlackCode> listcode = Db.Queryable<Air_TicketBlackCode>().Where(x => x.DiId == diid).ToList();
+            List<Air_TicketBlackCode> listcode = Db.Queryable<Air_TicketBlackCode>().Where(x => x.DiId == diid && x.IsDel == 0).ToList();
 
             //测试数据为序号,航班号,起飞日期,三字码,起飞时刻,到达时刻,出发航站楼,到达航站楼,机型,飞行时间
             //1.3U8391   TU17NOV CTUCAI  0220 0715   T1 T2  330  10H55M
@@ -4199,7 +4199,7 @@ namespace OpWin
                                         //GroupsTaskAssignmentService gts = new GroupsTaskAssignmentService();
 
                                         //77	行程
-                                        List<Grp_GroupsTaskAssignment> list2 = Db.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 77 && x.DIId == diid).ToList();
+                                        List<Grp_GroupsTaskAssignment> list2 = Db.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 77 && x.DIId == diid && x.IsDel == 0).ToList();
                                         foreach (var temp in list2)
                                         {
                                             //if (temp.UId != 21)
@@ -4209,7 +4209,7 @@ namespace OpWin
                                         }
 
                                         //85	机票预订
-                                        List<Grp_GroupsTaskAssignment> list6 = Db.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 85 && x.DIId == diid).ToList();
+                                        List<Grp_GroupsTaskAssignment> list6 = Db.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 85 && x.DIId == diid && x.IsDel == 0).ToList();
                                         foreach (var temp in list6)
                                         {
                                             //if (temp.UId != 21)
@@ -4817,7 +4817,7 @@ namespace OpWin
 
                 //查询该三字码所对应城市的数据
                 //ThreeCode Pre_TC = tcs.getByThree(Pre_citycode);
-                Res_ThreeCode Pre_TC = Db.Queryable<Res_ThreeCode>().First(x => x.Three == Pre_citycode.ToUpper());
+                Res_ThreeCode Pre_TC = Db.Queryable<Res_ThreeCode>().First(x => x.Three == Pre_citycode.ToUpper() && x.IsDel == 0 );
 
                 //验证是否存在三字码
                 if (Pre_TC == null)
@@ -4855,13 +4855,13 @@ namespace OpWin
 
         Res_ThreeCode getByThree(string three)
         {
-            return Db.Queryable<Res_ThreeCode>().First(x => x.Three == three);
+            return Db.Queryable<Res_ThreeCode>().First(x => x.Three == three && x.IsDel == 0 );
         }
 
         Res_AirCompany getByShortCode(string ShortCode)
         {
             //return this.excuteType("select * from AirCompany where Isdel=0 and ShortCode=@ShortCode", new SqlParameter("@ShortCode", ShortCode.ToUpper()));
-            return Db.Queryable<Res_AirCompany>().First(x => x.ShortCode == ShortCode.ToUpper());
+            return Db.Queryable<Res_AirCompany>().First(x => x.ShortCode == ShortCode.ToUpper() && x.IsDel == 0);
         }
 
         public class GoogleMapApiResult