diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookInController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookInController.cs
new file mode 100644
index 000000000..af0e99ca0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookInController.cs
@@ -0,0 +1,133 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public class TextBookInController : MvcControllerBase
+ {
+ private TextBookInIBLL textBookInIBLL = new TextBookInBLL();
+ private TextBookInOutIBLL textBookInOutIBLL = new TextbookInOutBLL();
+
+ #region 视图功能
+
+ ///
+ /// 主页面
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Index()
+ {
+ return View();
+ }
+ ///
+ /// 表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Form()
+ {
+ return View();
+ }
+ ///
+ /// 入库表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult FormIn()
+ {
+ ViewBag.BookCode = "RK" + DateTime.Now.ToString("yyyyMMddHHmmss");
+ return View();
+ }
+ #endregion
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetPageList(string pagination, string queryJson)
+ {
+ Pagination paginationobj = pagination.ToObject();
+ var data = textBookInIBLL.GetPageList(paginationobj, queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = paginationobj.total,
+ page = paginationobj.page,
+ records = paginationobj.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ /// 主键
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetFormData(string keyValue)
+ {
+ var TextBookInOutData = textBookInOutIBLL.GetKCEntity(keyValue);
+ //var TextBookInData = textBookInIBLL.GetInEntity(TextBookInOutData.BookCode);
+
+ var jsonData = new
+ {
+ TextBookInOut = TextBookInOutData,
+ //TextBookIn = TextBookInData,
+ };
+ return Success(jsonData);
+ }
+
+
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteForm(string keyValue)
+ {
+ textBookInIBLL.DeleteEntity(keyValue);
+ return Success("删除成功!");
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveForm(string keyValue, string strEntity, string strTextBookInList)
+ {
+ TextbookInOutEntity entity = strEntity.ToObject();
+ List textBookInList = strTextBookInList.ToObject>();
+ textBookInIBLL.SaveEntity(keyValue, entity, textBookInList);
+ return Success("保存成功!");
+ }
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextbookInOutController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextbookInOutController.cs
index 818b679c0..899aa1138 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextbookInOutController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextbookInOutController.cs
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpGet]
public ActionResult Form()
{
- ViewBag.BookCode = "KC" + DateTime.Now.ToString("yyyyMMddHHmm");
+ ViewBag.BookCode = "KC" + DateTime.Now.ToString("yyyyMMddHHmmss");
return View();
}
#endregion
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
}
else
{
- entity.UpTime =DateTime.Now ;
+ entity.UpTime = DateTime.Now;
entity.UpUserID = loginUserInfo.userId;
}
textbookInOutIBLL.SaveEntity(keyValue, entity);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.cshtml
new file mode 100644
index 000000000..87d1ef57f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.cshtml
@@ -0,0 +1,56 @@
+@{
+ ViewBag.Title = "教材库存表";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookIn/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.js
new file mode 100644
index 000000000..6594e58da
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Form.js
@@ -0,0 +1,164 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2022-03-02 10:37
+ * 描 述:教材库存表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var selectedRow;
+var refreshGirdData;
+var tempdatra = new Array();
+
+var bootstrap = function ($, learun) {
+ "use strict";
+ // 设置权限
+ setAuthorize = function (data) {
+ };
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ $("#detailadd").on('click', function () {
+ selectedRow = null;
+ learun.layerForm({
+ id: 'formTextBookIn',
+ title: '申请入库',
+ url: top.$.rootUrl + '/EducationalAdministration/TextBookIn/FormIn',
+ width: 500,
+ height: 500,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
+ //$("#detailedit").on('click', function () {
+ // var keyValue = $('#TextBookIn').jfGridValue('ID');
+ // selectedRow = $('#TextBookIn').jfGridGet('rowdata');
+ // if (learun.checkrow(keyValue)) {
+ // learun.layerForm({
+ // id: 'formTextBookIn',
+ // title: '修改入库单',
+ // url: top.$.rootUrl + '/EducationalAdministration/TextBookIn/FormIn?keyValue=' + keyValue,
+ // width: 600,
+ // height: 350,
+ // callBack: function (id) {
+ // return top[id].acceptClick(refreshGirdData);
+ // }
+ // });
+ // }
+ //});
+ $("#detaildel").on('click', function () {
+ var keyValue = $('#TextBookIn').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认删除该项!', function (res, index) {
+ if (res) {
+ $.each(tempdatra, function (key, val) {
+ if (tempdatra[key].ID === keyValue) {
+ // order -= tempdatra[key].TeachSum + tempdatra[key].StuSum;
+ tempdatra.splice(key, 1);
+ }
+ });
+ $('#TextBookIn').jfGridSet('refreshdata', tempdatra);
+ top.layer.close(index);
+ }
+ });
+ }
+ });
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+ $('#TextBookIn').jfGrid({
+ headData: [
+ { label: '入库单', name: 'BookCode', width: 180, align: 'left' },
+ { label: '入库数量', name: 'variate', width: 100, align: 'left' },
+ { label: '入库时间', name: 'CreateTime', width: 200, align: 'left' },
+ { label: '入库用户', name: 'CrateUserID', width: 100, align: 'left' },
+ { label: '备注', name: 'Remark', width: 100, align: 'left' },
+ ],
+ height: 400,
+ mainId: 'CreateTime desc',
+ reloadSelected: false,
+ });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookIn/GetFormData?keyValue=' + keyValue, function (data) {
+ console.log(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]);
+ }
+ }
+ });
+ }
+ }
+ };
+ refreshGirdData = function (temprow) {
+ var ifnewrow = true;
+ $.each(tempdatra, function (key, val) {
+ if (tempdatra[key].BookCode === temprow.InOutBook) {
+ tempdatra[key] = temprow;
+ ifnewrow = false;
+ }
+ });
+ if (ifnewrow) {
+ tempdatra.push(temprow);
+ }
+
+ $('#TextBookIn').jfGridSet('refreshdata', tempdatra);
+ };
+ // 设置表单数据
+ setFormData = function (processId, param, callback) {
+ if (!!processId) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookIn/GetFormDataByProcessId?processId=' + processId, function (data) {
+ for (var id in data) {
+ if (!!data[id] && data[id].length > 0) {
+ $('#' + id).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ if (id == 'TextBookIn' && data[id]) {
+ keyValue = data[id].ID;
+ }
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ // 验证数据是否填写完整
+ validForm = function () {
+ var datas = $('#TextBookIn').jfGridGet('rowdatas');
+ if (datas == null || datas.length == 0) {
+ learun.alert.warning("申请未包含入库申请!请先添加入库申请!");
+ return false;
+ }
+ return true;
+ };
+ // 保存数据
+ save = function (callBack) {
+ var postData = {};
+ var formData = $('[data-table="TextBookInOut"]').lrGetFormData();
+ postData.strEntity = JSON.stringify(formData);
+ postData.strTextBookInList = JSON.stringify($('#TextBookIn').jfGridGet('rowdatas'));
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TextBookIn/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.cshtml
new file mode 100644
index 000000000..8c34732fa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.cshtml
@@ -0,0 +1,30 @@
+@{
+ ViewBag.Title = "教材入库";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookIn/FormIn.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.js
new file mode 100644
index 000000000..e6385b771
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormIn.js
@@ -0,0 +1,57 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2022-03-03 10:15
+ * 描 述:教材入库
+ */
+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/TextBookIn/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]);
+ }
+ }
+ });
+ } else {
+ $("#BookCode").val(InBookCode);
+ }
+ }
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var postData = $('body').lrGetFormData();
+ if (!!keyValue) {
+ if (!!selectedRow) {
+ postData.ID = selectedRow.ID;
+ }
+ } else {
+ postData.ID = learun.newGuid();
+ }
+ if (!!callBack) {
+ callBack(postData);
+ return true;
+ }
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.cshtml
new file mode 100644
index 000000000..6b7d635ab
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.cshtml
@@ -0,0 +1,34 @@
+@{
+ ViewBag.Title = "教材入库";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookIn/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.js
new file mode 100644
index 000000000..e66a3c3a2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/Index.js
@@ -0,0 +1,99 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2022-03-03 10:15
+ * 描 述:教材入库
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '编辑',
+ url: top.$.rootUrl + '/EducationalAdministration/TextBookIn/Form?keyValue=' + keyValue,
+ width: 800,
+ height: 800,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/TextBookInOut/GetPageList',
+ headData: [
+ { label: '库存单号', name: 'BookCode', width: 200, align: "left" },
+ {
+ label: "课程", name: "LessonNo", width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+ key: value,
+ keyId: 'lessonno',
+ callback: function (_data) {
+ callback(_data['lessonname']);
+ }
+ });
+ }
+ },
+ { label: '教材名称', name: 'TextBookName', width: 200, align: "left" },
+ { label: '教材号', name: 'TextBookNo', width: 200, align: "left" },
+ { label: '出版号', name: 'PublishNo', width: 200, align: "left" },
+ { label: '第一作者', name: 'FirstAuthor', width: 200, align: "left" },
+ { label: '其他作者', name: 'OtherAuthor', width: 200, align: "left" },
+ { label: '出版社', name: 'Publisher', width: 200, align: "left" },
+ { label: '版次', name: 'Edition', width: 200, align: "left" },
+ { label: '印次', name: 'Impression', width: 200, align: "left" },
+ { label: '创建人', name: 'CreateTime', width: 200, align: "left" },
+ { label: '创建用户', name: 'CrateUserID', width: 200, align: "left" },
+ { label: '修改人', name: 'UpTime', width: 200, align: "left" },
+ { label: '修改用户', name: 'UpUserID', width: 200, align: "left" },
+ { label: '当前数量', name: 'FinallyNum', width: 200, align: "left" },
+ { label: '备注', name: 'Remark', width: 200, align: "left" },
+
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sidx: 'CreateTime desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.cshtml
new file mode 100644
index 000000000..5c13888e5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.cshtml
@@ -0,0 +1,32 @@
+@{
+ ViewBag.Title = "教材库存表";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookInOut/IndexIn.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.js
new file mode 100644
index 000000000..be51f319e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexIn.js
@@ -0,0 +1,118 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2022-03-02 10:37
+ * 描 述:教材库存表
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ // 查询
+ $('#btn_Search').on('click', function () {
+ var keyword = $('#txt_Keyword').val();
+ page.search({ keyword: keyword });
+ });
+ $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/EducationalAdministration/TextBookInOut/Form',
+ width: 700,
+ height: 500,
+ 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/TextBookInOut/Form?keyValue=' + keyValue,
+ width: 700,
+ height: 500,
+ 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/TextBookInOut/DeleteForm', { keyValue: keyValue }, function () {
+ });
+ }
+ });
+ }
+ });
+ },
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/TextBookInOut/GetPageList',
+ headData: [
+ { label: '库存单号', name: 'BookCode', width: 200, align: "left" },
+ {
+ label: "课程", name: "LessonNo", width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+ key: value,
+ keyId: 'lessonno',
+ callback: function (_data) {
+ callback(_data['lessonname']);
+ }
+ });
+ }
+ },
+ { label: '教材名称', name: 'TextBookName', width: 200, align: "left" },
+ { label: '教材号', name: 'TextBookNo', width: 200, align: "left" },
+ { label: '出版号', name: 'PublishNo', width: 200, align: "left" },
+ { label: '第一作者', name: 'FirstAuthor', width: 200, align: "left" },
+ { label: '其他作者', name: 'OtherAuthor', width: 200, align: "left" },
+ //{ label: '出版日期', name: 'Pubdate', width: 200, align: "left" },
+ { label: '出版社', name: 'Publisher', width: 200, align: "left" },
+ { label: '版次', name: 'Edition', width: 200, align: "left" },
+ { label: '印次', name: 'Impression', width: 200, align: "left" },
+ { label: '创建人', name: 'CreateTime', width: 200, align: "left" },
+ { label: '创建用户', name: 'CrateUserID', width: 200, align: "left" },
+ { label: '修改人', name: 'UpTime', width: 200, align: "left" },
+ { label: '修改用户', name: 'UpUserID', width: 200, align: "left" },
+ { label: '当前数量', name: 'FinallyNum', width: 200, align: "left" },
+ { label: '备注', name: 'Remark', width: 200, align: "left" },
+
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sidx: 'CreateTime desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 01818d1ac..9787d6588 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -842,6 +842,7 @@
+
@@ -1177,6 +1178,9 @@
+
+
+
@@ -6668,6 +6672,8 @@
+
+
@@ -7606,6 +7612,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TextBookInMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TextBookInMap.cs
new file mode 100644
index 000000000..126ebe0e3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TextBookInMap.cs
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public class TextBookInMap : EntityTypeConfiguration
+ {
+ public TextBookInMap()
+ {
+ #region 表、主键
+ //表
+ this.ToTable("TEXTBOOKIN");
+ //主键
+ this.HasKey(t => t.ID);
+ #endregion
+
+ #region 配置关系
+ #endregion
+ }
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 4cfc93979..3fa4c19f8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
@@ -596,6 +596,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInBLL.cs
new file mode 100644
index 000000000..2985076ce
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInBLL.cs
@@ -0,0 +1,173 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public class TextBookInBLL : TextBookInIBLL
+ {
+ private TextBookInService textBookInService = new TextBookInService();
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ return textBookInService.GetPageList(pagination, queryJson);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取TextBookIn表实体数据
+ ///
+ /// 主键
+ ///
+ public TextBookInEntity GetTextBookInEntity(string keyValue)
+ {
+ try
+ {
+ return textBookInService.GetTextBookInEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取TextBookIn表RK明细
+ ///
+ /// 主键
+ ///
+ public IEnumerable GetInEntity(string keyValue)
+ {
+ try
+ {
+ return textBookInService.GetInEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ try
+ {
+ textBookInService.DeleteEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ public void SaveEntity(string keyValue, TextBookInEntity entity)
+ {
+ try
+ {
+ textBookInService.SaveEntity(keyValue, entity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ public void SaveEntity(string keyValue, TextbookInOutEntity entity, List textBookInList)
+ {
+ try
+ {
+ textBookInService.SaveEntity(keyValue, entity, textBookInList);
+ }
+ 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/EducationalAdministration/TextBookIn/TextBookInEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInEntity.cs
new file mode 100644
index 000000000..76a052dc6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInEntity.cs
@@ -0,0 +1,135 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public class TextBookInEntity
+ {
+ #region 实体成员
+ ///
+ /// ID
+ ///
+ [Column("ID")]
+ public string ID { get; set; }
+ ///
+ /// 库存单号
+ ///
+ [Column("INOUTCODE")]
+ public string InOutCode { get; set; }
+ ///
+ /// BookCode
+ ///
+ [Column("BOOKCODE")]
+ public string BookCode { get; set; }
+ ///
+ /// 课程
+ ///
+ [Column("LESSONNO")]
+ public string LessonNo { get; set; }
+ ///
+ /// PublishNo
+ ///
+ [Column("PUBLISHNO")]
+ public string PublishNo { get; set; }
+ ///
+ /// 教材号
+ ///
+ [Column("TEXTBOOKNO")]
+ public string TextBookNo { get; set; }
+ ///
+ /// 教材名称
+ ///
+ [Column("TEXTBOOKNAME")]
+ public string TextBookName { get; set; }
+ ///
+ /// 第一作者
+ ///
+ [Column("FIRSTAUTHOR")]
+ public string FirstAuthor { get; set; }
+ ///
+ /// 其他作者
+ ///
+ [Column("OTHERAUTHOR")]
+ public string OtherAuthor { get; set; }
+ ///
+ /// 出版日期
+ ///
+ [Column("PUBDATE")]
+ public DateTime? Pubdate { get; set; }
+ ///
+ /// 出版社
+ ///
+ [Column("PUBLISHER")]
+ public string Publisher { get; set; }
+ ///
+ /// 版次
+ ///
+ [Column("EDITION")]
+ public string Edition { get; set; }
+ ///
+ /// 印次
+ ///
+ [Column("IMPRESSION")]
+ public string Impression { get; set; }
+ ///
+ /// 创建人
+ ///
+ [Column("CREATETIME")]
+ public DateTime? CreateTime { get; set; }
+ ///
+ /// 创建版次
+ ///
+ [Column("CRATEUSERID")]
+ public string CrateUserID { get; set; }
+ ///
+ /// UpTime
+ ///
+ [Column("UPTIME")]
+ public DateTime? UpTime { get; set; }
+ ///
+ /// UpUserID
+ ///
+ [Column("UPUSERID")]
+ public string UpUserID { get; set; }
+ ///
+ /// variate
+ ///
+ [Column("VARIATE")]
+ public decimal? variate { get; set; }
+ ///
+ /// Remark
+ ///
+ [Column("REMARK")]
+ public string Remark { get; set; }
+ #endregion
+
+ #region 扩展操作
+ ///
+ /// 新增调用
+ ///
+ public void Create()
+ {
+ this.ID = Guid.NewGuid().ToString();
+ }
+ ///
+ /// 编辑调用
+ ///
+ ///
+ public void Modify(string keyValue)
+ {
+ this.ID = keyValue;
+ }
+ #endregion
+ #region 扩展字段
+ #endregion
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInIBLL.cs
new file mode 100644
index 000000000..75f63c668
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInIBLL.cs
@@ -0,0 +1,62 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public interface TextBookInIBLL
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 查询参数
+ ///
+ IEnumerable GetPageList(Pagination pagination, string queryJson);
+ ///
+ /// 获取TextBookIn表实体数据
+ ///
+ /// 主键
+ ///
+ TextBookInEntity GetTextBookInEntity(string keyValue);
+ ///
+ /// 获取TextBookIn表RK明细
+ ///
+ /// 主键
+ ///
+ IEnumerable GetInEntity(string keyValue);
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ void DeleteEntity(string keyValue);
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ void SaveEntity(string keyValue, TextBookInEntity entity);
+
+ ///
+ /// 保存实体数据
+ ///
+ ///
+ ///
+ ///
+ void SaveEntity(string keyValue, TextbookInOutEntity entity, List textBookIndentDatail);
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInService.cs
new file mode 100644
index 000000000..f986761f5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIn/TextBookInService.cs
@@ -0,0 +1,234 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-03-03 10:15
+ /// 描 述:教材入库
+ ///
+ public class TextBookInService : RepositoryFactory
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 查询参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ var strSql = new StringBuilder();
+ strSql.Append("SELECT ");
+ strSql.Append(@"
+ t.ID,
+ t.TextBookName,
+ t.CreateTime,
+ t.CrateUserID
+ ");
+ strSql.Append(" FROM TextBookIn t ");
+ strSql.Append(" WHERE 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["TextBookName"].IsEmpty())
+ {
+ dp.Add("TextBookName", queryParam["TextBookName"].ToString(), DbType.String);
+ strSql.Append(" AND t.TextBookName = @TextBookName ");
+ }
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取TextBookIn表实体数据
+ ///
+ /// 主键
+ ///
+ public TextBookInEntity GetTextBookInEntity(string keyValue)
+ {
+ try
+ {
+ return this.BaseRepository("CollegeMIS").FindEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取TextBookIn表RK明细
+ ///
+ /// 主键
+ ///
+ public IEnumerable GetInEntity(string keyValue)
+ {
+ try
+ {
+ return this.BaseRepository("CollegeMIS").FindList(x => x.InOutCode == keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ try
+ {
+ this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ public void SaveEntity(string keyValue, TextBookInEntity 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);
+ }
+ }
+ }
+
+ ///
+ /// 保存
+ ///
+ ///
+ /// 库存
+ ///
+ public void SaveEntity(string keyValue, TextbookInOutEntity entity, List textbookInList)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ decimal? variate = 0;
+ if (textbookInList.Count > 0)
+ {
+ for (int i = 0; i < textbookInList.Count; i++)
+ {
+ textbookInList[i].InOutCode = entity.BookCode;
+ textbookInList[i].LessonNo = entity.LessonNo;
+ textbookInList[i].PublishNo = entity.PublishNo;
+ textbookInList[i].TextBookNo = entity.TextBookNo;
+ textbookInList[i].TextBookName = entity.TextBookName;
+ textbookInList[i].FirstAuthor = entity.FirstAuthor;
+ textbookInList[i].OtherAuthor = entity.OtherAuthor;
+ textbookInList[i].Pubdate = entity.Pubdate;
+ textbookInList[i].Publisher = entity.Publisher;
+ textbookInList[i].Edition = entity.Edition;
+ textbookInList[i].Impression = entity.Impression;
+ textbookInList[i].Impression = entity.Impression;
+ variate += textbookInList[i].variate;
+ }
+ entity.Create();
+ this.BaseRepository("CollegeMIS").Insert(textbookInList);
+
+ if (variate != 0 && variate > 0)
+ {
+ var newtextInOutEntity = db.FindEntity(x => x.BookCode == entity.BookCode);
+ if (newtextInOutEntity != null)
+ {
+ newtextInOutEntity.FinallyNum += variate;
+ db.Update(newtextInOutEntity);
+ }
+ }
+ }
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutBLL.cs
index 3a803549c..54bd9e321 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutBLL.cs
@@ -66,7 +66,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
-
+
///
/// 获取实体数据
///
@@ -91,6 +91,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
+ ///
+ /// 获取KC实体数据
+ ///
+ /// 主键
+ ///
+ public TextbookInOutEntity GetKCEntity(string keyValue)
+ {
+ try
+ {
+ return textbookInOutService.GetEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
#endregion
#region 提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutIBLL.cs
index 39a69539c..eec009143 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutIBLL.cs
@@ -34,6 +34,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 主键
///
TextbookInOutEntity GetEntity(string keyValue);
+ ///
+ /// 获取KC未删除实体数据
+ ///
+ /// 主键
+ ///
+ TextbookInOutEntity GetKCEntity(string keyValue);
#endregion
#region 提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutService.cs
index 60712203b..b45e7d431 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutService.cs
@@ -71,6 +71,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
strSql.Append(" and ( t.TextBookNo like @keyword or t.TextBookName like @keyword or t.FirstAuthor like @keyword )");
dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
}
+ if (!queryParam["TextBookName"].IsEmpty())
+ {
+ strSql.Append(" and TextBookName like @TextBookName )");
+ dp.Add("TextBookName", "%" + queryParam["TextBookName"].ToString() + "%", DbType.String);
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
@@ -95,7 +100,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
try
{
- return this.BaseRepository("CollegeMIS").FindEntity(keyValue);
+ return this.BaseRepository("CollegeMIS").FindEntity(x => x.ID == keyValue && x.IsDel == 0);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 5abd4943f..ea8266c36 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
@@ -287,6 +287,10 @@
+
+
+
+
@@ -1802,10 +1806,6 @@
-
-
-
-
@@ -1814,10 +1814,10 @@
-
-
-
-
+
+
+
+