解决冲突

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookIndentController.cs

@@ -121,12 +121,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormDataByProcessId(string processId)
         {
             var TextBookIndentData = textBookIndentIBLL.GetEntityByProcessId(processId);
+            var TextBookIndentDetailData = textBookIndentIBLL.TextBookIndentDetailList(TextBookIndentData.ID);
             var jsonData = new
             {
                 TextBookIndent = TextBookIndentData,
+                TextBookIndentDetail = TextBookIndentDetailData,
             };
             return Success(jsonData);
         }
+
+
+        /// <summary>
+        /// 学年下拉框（四位）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAcademicYear()
+        {
+            var data = WebHelper.GenerateNearByYear();
+            return Success(data);
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookSolSubController.cs

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public class TextBookSolSubController : MvcControllerBase
+    {
+        private TextBookSolSubIBLL textBookSolSubIBLL = new TextBookSolSubBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = textBookSolSubIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TextBookSolSubData = textBookSolSubIBLL.GetTextBookSolSubEntity( keyValue );
+            var jsonData = new {
+                TextBookSolSub = TextBookSolSubData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            textBookSolSubIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TextBookSolSubEntity entity = strEntity.ToObject<TextBookSolSubEntity>();
+            textBookSolSubIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookSolSubDetailController.cs

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public class TextBookSolSubDetailController : MvcControllerBase
+    {
+        private TextBookSolSubDetailIBLL textBookSolSubDetailIBLL = new TextBookSolSubDetailBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = textBookSolSubDetailIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TextBookSolSubDetailData = textBookSolSubDetailIBLL.GetTextBookSolSubDetailEntity( keyValue );
+            var jsonData = new {
+                TextBookSolSubDetail = TextBookSolSubDetailData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            textBookSolSubDetailIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TextBookSolSubDetailEntity entity = strEntity.ToObject<TextBookSolSubDetailEntity>();
+            textBookSolSubDetailIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Form.js

@@ -87,13 +87,13 @@ var bootstrap = function ($, learun) {
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
             //学期
             $('#Semester').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择学期",
                 allowSearch: true,
                 url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/FormLook.js

@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/FormView.cshtml

@@ -25,8 +25,8 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">所选书籍<font face="宋体">*</font></div>
+        @*<div id="TextBookName" isvalid="yes" checkexpession="NotNull" readonly></div>*@
         <input id="TextBookName" type="text" class="form-control" readonly />
-        @*<div id="" readonly></div>*@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">书籍</div>
@@ -40,12 +40,13 @@
         <div class="lr-form-item-title">其他作者</div>
         <input id="OtherAuthor" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-12 lr-form-item lr-form-item-grid">
-        <div id="TextBookIndentDetail"></div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookIndent">
+        <div class="lr-form-item-title">订购数量</div>
+        <input id="OrderNum" type="number" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TextBookIndent" style="display: none; ">
         <div class="lr-form-item-title">当前信息</div>
@@ -59,5 +60,8 @@
         <div class="lr-form-item-title">状态</div>
         <input id="Status" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="TextBookIndentDetail"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookIndent/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/FormView.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Index.js

@@ -177,9 +177,9 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'formlook',
+                        id: 'formview',
                         title: '查看',
-                        url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/FormLook?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/FormView?keyValue=' + keyValue,
                         width: 1000,
                         height: 700,
                         btn: null,
@@ -235,8 +235,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
-                    { label: "所选书籍", name: "TextBookName", width: 200, align: "left" },
-                    { label: "书籍编码", name: "PublishNo", width: 150, align: "left" },
+                    { label: "教材名称", name: "TextBookName", width: 200, align: "left" },
+                    { label: "书号（物料号）", name: "PublishNo", width: 150, align: "left" },
                     { label: "作者", name: "FirstAuthor", width: 100, align: "left" },
                     { label: "其他作者", name: "OtherAuthor", width: 150, align: "left" },
                     { label: "出版社", name: "Publisher", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSub/Form.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "教材征订管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="TextBookSolSub" >
+        <div class="lr-form-item-title">文本框</div>
+        <input id="DeptNo" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookSolSub/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSub/Form.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-01 17:26
+ * 描  述：教材征订管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSub/Index.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "教材征订管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookSolSub/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSub/Index.js

@@ -0,0 +1,88 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-01 17:26
+ * 描  述：教材征订管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/GetPageList',
+                headData: [
+                    { label: "文本框", name: "DeptNo", width: 100, align: "left"},
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Form.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "教材征订管理明细";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="TextBookSolSubDetail" >
+        <div class="lr-form-item-title">文本框</div>
+        <input id="TeachSum" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Form.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-02 09:29
+ * 描  述：教材征订管理明细
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Index.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "教材征订管理明细";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookSolSubDetail/Index.js

@@ -0,0 +1,88 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-02 09:29
+ * 描  述：教材征订管理明细
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSubDetail/GetPageList',
+                headData: [
+                    { label: "文本框", name: "TeachSum", width: 100, align: "left"},
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs

@@ -256,17 +256,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult GetClassifyList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = accommodationIBLL.GetClassifyList(paginationobj,queryJson);
-            var jsonData = new
-            {
-                rows = data,
-                total = paginationobj.total,
-                page = paginationobj.page,
-                records = paginationobj.records
-            };
-            return Success(jsonData);
+            var data = accommodationIBLL.GetClassifyList(paginationobj, queryJson).OrderBy(x => x.DNo);
+            //var jsonData = new
+            //{
+            //    rows = data,
+            //    total = paginationobj.total,
+            //    page = paginationobj.page,
+            //    records = paginationobj.records
+            //};
+            return Success(data);
         }
-        
+
         /// <summary>
         /// 获取宿舍楼数据
         /// </summary>
@@ -379,7 +379,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             var data = accommodationIBLL.GetClassifyTree();
             return Success(data);
         }
-        
+
 
         #endregion
 
@@ -404,7 +404,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DeleteBed(string keyValue,string ParentID)
+        public ActionResult DeleteBed(string keyValue, string ParentID)
         {
             accommodationIBLL.DeleteBed(keyValue, ParentID);
             return Success("删除成功！");
@@ -431,13 +431,13 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveBedForm(string keyValue,string ParentID, string strEntity)
+        public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity)
         {
             Acc_DormitoryBuildEntity entity = strEntity.ToObject<Acc_DormitoryBuildEntity>();
             accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity);
             return Success("保存成功！");
         }
-        
+
         /// <summary>
         /// 寝室分配系
         /// <param name="keyValue">主键</param>
@@ -446,7 +446,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveDeptClass(string keyValue, string strEntity,int type)
+        public ActionResult SaveDeptClass(string keyValue, string strEntity, int type)
         {
             Acc_DormitoryBuildEntity entity = strEntity.ToObject<Acc_DormitoryBuildEntity>();
             accommodationIBLL.SaveDeptClass(keyValue, entity, type);
@@ -466,7 +466,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             accommodationIBLL.SaveRoom(RoomId, list);
             return Success("保存成功！");
         }
-        
+
         /// <summary>
         /// 学生宿舍的单元、楼层、房间、床位添加
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js

@@ -184,7 +184,8 @@ var bootstrap = function ($, learun) {
             //批量添加宿舍
             $("#lr_dormitoryAdd").on("click", function () {
                 var keyvalue1 = $("#gridtable").jfGridValue("ID");
-                if (selectedParent.ChildType == "2") {
+                //console.log(selectedParent.ChildType);
+                if (selectedParent.BuildType == "1") {
                     var keyValue = selectedParent.ID;
                     learun.layerForm({
                         id: 'form',
@@ -268,12 +269,12 @@ var bootstrap = function ($, learun) {
             //分类管理
             $("#lr_Classify").on("click", function () {
                 learun.layerForm({
-                    id: 'indexBed',
+                    id: 'indexClassify',
                     title: '分类管理',
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/IndexClassify',
                     width: 1200,
                     height: 780,
-                    btn:null,
+                    //btn:null,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -432,7 +433,7 @@ var bootstrap = function ($, learun) {
                                     learun.clientdata.getAsync('custmerData', {
                                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
                                         key: value,
-                                        keyId: 'stuid',
+                                        keyId: 'stuno',
                                         callback: function (_data) {
                                             callback(_data['stuname']);
                                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.js

@@ -158,9 +158,11 @@ var bootstrap = function ($, learun) {
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
-                isPage: true,
-                isMultiselect: true,
-                sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ',
+                isPage: false,
+                //isMultiselect: true,
+                //sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ',
+                isTree: true,                
+                parentId: 'ParentID',        
             });
             page.search();
         },
@@ -176,9 +178,10 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
+        learun.layerClose('indexClassify', '');
         if (!!callBack) {
             callBack();
-        }
+        } 
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js

@@ -480,7 +480,7 @@ var bootstrap = function ($, learun) {
                                     learun.clientdata.getAsync('custmerData', {
                                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
                                         key: value,
-                                        keyId: 'stuid',
+                                        keyId: 'stuno',
                                         callback: function (_data) {
                                             callback(_data['stuname']);
                                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -839,7 +839,9 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TextBookInfoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TextBookIndentController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TextBookIndentDetailController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\TextBookInOutController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TextBookSolSubController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TextBookSolSubDetailController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TextbookInOutController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6654,6 +6656,14 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextbookInOut\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextbookInOut\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextbookInOut\Form.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TextBookSolSubDetailMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public class TextBookSolSubDetailMap : EntityTypeConfiguration<TextBookSolSubDetailEntity>
+    {
+        public TextBookSolSubDetailMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEXTBOOKSOLSUBDETAIL");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TextBookSolSubMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public class TextBookSolSubMap : EntityTypeConfiguration<TextBookSolSubEntity>
+    {
+        public TextBookSolSubMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEXTBOOKSOLSUB");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -593,7 +593,9 @@
     <Compile Include="EducationalAdministration\TextBookInfoMap.cs" />
     <Compile Include="EducationalAdministration\TextBookIndentMap.cs" />
     <Compile Include="EducationalAdministration\TextBookIndentDetailMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookInOutMap.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubMap.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubDetailMap.cs" />
+    <Compile Include="EducationalAdministration\TextbookInOutMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentService.cs

@@ -146,7 +146,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<TextBookIndentDetailEntity>(t=>t.IndentId==keyValue);
+                return this.BaseRepository("CollegeMIS").FindList<TextBookIndentDetailEntity>(t => t.IndentId == keyValue);
             }
             catch (Exception ex)
             {
@@ -281,7 +281,42 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                 if (pastatus == 2)
                 {
+                    //教材订单明细
+                    var detailList = db.FindList<TextBookIndentDetailEntity>(x => x.IndentId == entity.ID);
+
                     //审核通过，添加征订数据
+                    TextBookSolSubEntity textBookSolSub = new TextBookSolSubEntity();
+                    textBookSolSub.Create();
+                    textBookSolSub.TextBookIndentId = entity.ID;
+                    textBookSolSub.DeptNo = entity.DeptNo;
+                    textBookSolSub.MajorNo = entity.MajorNo;
+                    textBookSolSub.LessonNo = entity.LessonNo;
+                    textBookSolSub.AcademicYearNo = entity.AcademicYearNo;
+                    textBookSolSub.Semester = entity.Semester;
+                    textBookSolSub.PublishNo = entity.PublishNo;
+                    textBookSolSub.TextBookNo = entity.TextBookNo;
+                    textBookSolSub.TextBookName = entity.TextBookName;
+                    textBookSolSub.FirstAuthor = entity.FirstAuthor;
+                    textBookSolSub.OtherAuthor = entity.OtherAuthor;
+                    textBookSolSub.OrderNum = entity.OrderNum;
+                    textBookSolSub.Remark = entity.Remark;
+                    textBookSolSub.Publisher = entity.Publisher;
+                    textBookSolSub.Edition = entity.Edition;
+                    textBookSolSub.Price = entity.Price;
+                    textBookSolSub.ClassSum = entity.ClassSum;
+                    db.Insert(textBookSolSub);
+
+                    foreach (var detail in detailList)
+                    {
+                        TextBookSolSubDetailEntity textBookSolSubDetail = new TextBookSolSubDetailEntity();
+                        textBookSolSubDetail.Create();
+                        textBookSolSubDetail.SolSubId = textBookSolSub.ID;
+                        textBookSolSubDetail.ClassNo = detail.ClassNo;
+                        textBookSolSubDetail.TeachSum = detail.TeachSum;
+                        textBookSolSubDetail.StuSum = detail.StuSum;
+                        textBookSolSubDetail.Remark = detail.Remark;
+                        db.Insert(textBookSolSubDetail);
+                    }
                 }
                 db.Commit();
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSub/TextBookSolSubBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public class TextBookSolSubBLL : TextBookSolSubIBLL
+    {
+        private TextBookSolSubService textBookSolSubService = new TextBookSolSubService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TextBookSolSubEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return textBookSolSubService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TextBookSolSub表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TextBookSolSubEntity GetTextBookSolSubEntity(string keyValue)
+        {
+            try
+            {
+                return textBookSolSubService.GetTextBookSolSubEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                textBookSolSubService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, TextBookSolSubEntity entity)
+        {
+            try
+            {
+                textBookSolSubService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSub/TextBookSolSubEntity.cs

@@ -0,0 +1,158 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public class TextBookSolSubEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 教材订单表ID
+        /// </summary>
+        [Column("TEXTBOOKINDENTID")]
+        public string TextBookIndentId { get; set; }
+        
+        /// <summary>
+        /// 专业部
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 课程
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// 学年
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// 学期
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// CreateUserID
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserID { get; set; }
+        /// <summary>
+        /// 出版号
+        /// </summary>
+        [Column("PUBLISHNO")]
+        public string PublishNo { get; set; }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        [Column("TEXTBOOKNO")]
+        public string TextBookNo { get; set; }
+        /// <summary>
+        /// 教材名称
+        /// </summary>
+        [Column("TEXTBOOKNAME")]
+        public string TextBookName { get; set; }
+        /// <summary>
+        /// 第一作者
+        /// </summary>
+        [Column("FIRSTAUTHOR")]
+        public string FirstAuthor { get; set; }
+        /// <summary>
+        /// 其他作者
+        /// </summary>
+        [Column("OTHERAUTHOR")]
+        public string OtherAuthor { get; set; }
+        /// <summary>
+        /// 订购数量
+        /// </summary>
+        [Column("ORDERNUM")]
+        public int? OrderNum { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 出版社
+        /// </summary>
+        [Column("PUBLISHER")]
+        public string Publisher { get; set; }
+        /// <summary>
+        /// 版次
+        /// </summary>
+        [Column("EDITION")]
+        public string Edition { get; set; }
+        /// <summary>
+        /// Price
+        /// </summary>
+        [Column("PRICE")]
+        public decimal? Price { get; set; }
+        /// <summary>
+        /// Status
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        /// <summary>
+        /// processId
+        /// </summary>
+        [Column("PROCESSID")]
+        public string processId { get; set; }
+        /// <summary>
+        /// ClassSum
+        /// </summary>
+        [Column("CLASSSUM")]
+        public string ClassSum { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUserID = LoginUserInfo.Get().userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSub/TextBookSolSubIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public interface TextBookSolSubIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TextBookSolSubEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TextBookSolSub表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TextBookSolSubEntity GetTextBookSolSubEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, TextBookSolSubEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSub/TextBookSolSubService.cs

@@ -0,0 +1,145 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-01 17:26
+    /// 描 述：教材征订管理
+    /// </summary>
+    public class TextBookSolSubService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TextBookSolSubEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.DeptNo
+                ");
+                strSql.Append("  FROM TextBookSolSub t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<TextBookSolSubEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TextBookSolSub表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TextBookSolSubEntity GetTextBookSolSubEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TextBookSolSubEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<TextBookSolSubEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, TextBookSolSubEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public class TextBookSolSubDetailBLL : TextBookSolSubDetailIBLL
+    {
+        private TextBookSolSubDetailService textBookSolSubDetailService = new TextBookSolSubDetailService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TextBookSolSubDetailEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return textBookSolSubDetailService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TextBookSolSubDetail表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TextBookSolSubDetailEntity GetTextBookSolSubDetailEntity(string keyValue)
+        {
+            try
+            {
+                return textBookSolSubDetailService.GetTextBookSolSubDetailEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                textBookSolSubDetailService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, TextBookSolSubDetailEntity entity)
+        {
+            try
+            {
+                textBookSolSubDetailService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailEntity.cs

@@ -0,0 +1,70 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public class TextBookSolSubDetailEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// SolSubId
+        /// </summary>
+        [Column("SOLSUBID")]
+        public string SolSubId { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// TeachSum
+        /// </summary>
+        [Column("TEACHSUM")]
+        public string TeachSum { get; set; }
+        /// <summary>
+        /// StuSum
+        /// </summary>
+        [Column("STUSUM")]
+        public string StuSum { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public interface TextBookSolSubDetailIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TextBookSolSubDetailEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TextBookSolSubDetail表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TextBookSolSubDetailEntity GetTextBookSolSubDetailEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, TextBookSolSubDetailEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailService.cs

@@ -0,0 +1,145 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-03-02 09:29
+    /// 描 述：教材征订管理明细
+    /// </summary>
+    public class TextBookSolSubDetailService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TextBookSolSubDetailEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.TeachSum
+                ");
+                strSql.Append("  FROM TextBookSolSubDetail t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<TextBookSolSubDetailEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TextBookSolSubDetail表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TextBookSolSubDetailEntity GetTextBookSolSubDetailEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TextBookSolSubDetailEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<TextBookSolSubDetailEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, TextBookSolSubDetailEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1802,6 +1802,18 @@
     <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailService.cs" />
     <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailIBLL.cs" />
     <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailBLL.cs" />
+    <Compile Include="EducationalAdministration\TextbookInOut\TextbookInOutEntity.cs" />
+    <Compile Include="EducationalAdministration\TextbookInOut\TextbookInOutService.cs" />
+    <Compile Include="EducationalAdministration\TextbookInOut\TextbookInOutIBLL.cs" />
+    <Compile Include="EducationalAdministration\TextbookInOut\TextbookInOutBLL.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubEntity.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubService.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubBLL.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSub\TextBookSolSubIBLL.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailEntity.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailService.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailBLL.cs" />
+    <Compile Include="EducationalAdministration\TextBookSolSubDetail\TextBookSolSubDetailIBLL.cs" />
     <Compile Include="EducationalAdministration\TextBookInOut\TextBookInOutEntity.cs" />
     <Compile Include="EducationalAdministration\TextBookInOut\TextBookInOutService.cs" />
     <Compile Include="EducationalAdministration\TextBookInOut\TextBookInOutIBLL.cs" />

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

@@ -298,7 +298,8 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                     dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Name Like @Name ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(strSql.ToString(), dp, pagination).ToList();
+                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(strSql.ToString(), dp).ToList();
+                //return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(strSql.ToString(), dp, pagination).ToList();
             }
             catch (Exception ex)
             {
@@ -719,7 +720,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(x => ( x.BuildType == "2" || x.BuildType == "1")).ToList();
+                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(x => (x.BuildType == "2" || x.BuildType == "1")).ToList();
             }
             catch (Exception ex)
             {
@@ -1110,6 +1111,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                             UpdateTime = DateTime.Now
                         };
                         elementEntity.Create();
+                        elementEntity.UnitId = elementEntity.ID;
                         list.Add(elementEntity);
 
                         //添加楼层
@@ -1140,6 +1142,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                                     UpdateTime = DateTime.Now
                                 };
                                 floorEntity.Create();
+                                floorEntity.FloorId = floorEntity.ID;
                                 list.Add(floorEntity);
 
                                 //添加房间
@@ -1535,9 +1538,11 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                 }
                 else
                 {
+                    entity.Create();
                     if (entity.BuildType == "1")
                     {
-                        if (string.IsNullOrEmpty(entity.ParentID))
+                        entity.ApartmentId = entity.ID;
+                        if (string.IsNullOrEmpty(entity.ParentID) || entity.ParentID == "-1")
                         {
                             var rootNode = this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>().FirstOrDefault(a => a.ParentID == null);
                             if (rootNode == null)
@@ -1563,14 +1568,17 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                     }
                     else
                     {
+                        //上一级
                         var parentity = this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>().FirstOrDefault(a => a.ID == entity.ParentID);
                         switch (parentity.BuildType)
                         {
                             case "1":
                                 entity.ApartmentId = parentity.ID;
+                                entity.UnitId = entity.ID;
                                 break;
                             case "2":
                                 {
+                                    entity.FloorId = entity.ID;
                                     entity.UnitId = parentity.ID;
                                     entity.ApartmentId = parentity.ApartmentId;
                                 }
@@ -1585,7 +1593,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                         }
                     }
 
-                    entity.Create();
                     entity.CreateBy = currentUser.realName;
                     entity.CreateTime = DateTime.Now;
                     entity.UpdateBy = currentUser.realName;