[宿舍导入] 优化已存在的空床位导入学生

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -2190,6 +2190,49 @@ where ID='{ParentID}'
                                 dormitoryBuildList.Add(bed);
                                 snum++;
                             }
+                            else
+                            {
+                                //床位不为空 学生为空
+                                if (bed.StudentID.IsEmpty())
+                                {
+                                    //相同学号的学生提示已分配
+                                    var histroystu = db.FindEntity<Acc_DormitoryBuildEntity>(x => x.StudentID == stuno);
+                                    if (histroystu != null)
+                                    {
+                                        fnum++;
+                                        dr["导入错误"] = "此学生已分配！";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+                                    else
+                                    {
+                                        //修改已存在的空床位
+                                        bed.ParentID = dormitory.ID;
+                                        bed.ApartmentId = apartment.ID;
+                                        bed.UnitId = unit.ID;
+                                        bed.FloorId = floor.ID;
+                                        bed.DNo = bedCode;
+                                        bed.Name = bedName;
+                                        bed.Dept = DeptNo;
+                                        bed.Major = MajorNo;
+                                        bed.Class = ClassNo;
+                                        bed.StudentID = stuno;
+                                        bed.Leader = leaderno;
+                                        bed.BuildType = "5";
+                                        bed.UpdateBy = user.realName;
+                                        bed.UpdateTime = DateTime.Now;
+                                        db.Update(bed);
+                                        snum++;
+                                    }
+                                }
+                                else
+                                {
+                                    fnum++;
+                                    dr["导入错误"] = "此床位已有学生！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+                            }
 
                         }
                         else