diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
index f66d1a954..7dc28ac73 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
@@ -207,27 +207,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
return View();
}
-
- ///
- /// 分配专业和班级
- ///
- ///
- [HttpGet]
- public ActionResult FormClass()
- {
- return View();
- }
- ///
- /// 分配宿舍
- ///
- ///
- [HttpGet]
- public ActionResult FormRoom()
- {
- return View();
- }
-
-
#endregion
#region 获取数据
@@ -397,6 +376,18 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
return Success("删除成功!");
}
///
+ /// 删除
+ /// 主键
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteBed(string keyValue,string ParentID)
+ {
+ accommodationIBLL.DeleteBed(keyValue, ParentID);
+ return Success("删除成功!");
+ }
+ ///
/// 保存实体数据(新增、修改)
/// 主键
///
@@ -410,7 +401,21 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
accommodationIBLL.SaveEntity(keyValue, entity);
return Success("保存成功!");
}
-
+ ///
+ /// 保存实体数据(新增、修改)
+ /// 主键
+ ///
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveBedForm(string keyValue,string ParentID, string strEntity)
+ {
+ Acc_DormitoryBuildEntity entity = strEntity.ToObject();
+ accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity);
+ return Success("保存成功!");
+ }
+
///
/// 寝室分配系
/// 主键
@@ -439,6 +444,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
accommodationIBLL.SaveRoom(RoomId, list);
return Success("保存成功!");
}
+
///
/// 学生宿舍的单元、楼层、房间、床位添加
///
@@ -450,11 +456,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
[AjaxOnly]
public ActionResult DormitoryAdd(string keyValue, string strEntity)
{
- //dynamic entity = JsonConvert.DeserializeObject(strEntity);
- //var ElementNum = entity.ElementNum;
- //var FloorNum = entity.FloorNum;
- //var RoomNum = entity.RoomNUm;
- //var BedNum = entity.BedNum;
JObject jsonEntity = JObject.Parse(strEntity);
var elementNum = int.Parse(jsonEntity["ElementNum"].ToString());
@@ -491,9 +492,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
accommodationIBLL.SyncData();
return Success("同步成功");
-
-
- //public ActionResult DormitoryAdd(string a,string )
+ }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs
index ea1a3d8ec..2e7e581fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs
@@ -706,7 +706,26 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
}
}
+ public void SyncData()
+ {
+ try
+ {
+ accommodationService.SyncData();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+
+ }
+ }
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs
index 84cee539c..253fe4109 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs
@@ -95,6 +95,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
void Automatic_allocation_accommodation(bool noNation, bool noPlace);
+ void SyncData();
object GetDormitoryList();
object GetUnitList(string ParentID);
object GetFloorList(string parentID);