diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml index e60a348e4..11c191eb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml @@ -21,12 +21,6 @@
盘点说明
-
-
明细操作
- - - -
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js index 6c6fe0fcf..c5104d66a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js @@ -27,62 +27,32 @@ var bootstrap = function ($, learun) { var page = { init: function () { $('.lr-form-wrap').lrscroll(); - - $("#detailadd").on('click', function () { - selectedRow = null; - learun.layerForm({ - id: 'formitem', - title: '新增明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_InventoryItemApply/Form', - width: 860, - height: 600, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - $("#detailedit").on('click', function () { - Ass_InventoryItem - var keyValue = $('#Ass_InventoryItem').jfGridValue('AAIId'); - selectedRow = $('#Ass_InventoryItem').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'formitem', - title: '编辑明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_InventoryItemApply/Form?keyValue=' + keyValue, - width: 860, - height: 600, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - $("#detaildel").on('click', function () { - var keyValue = $('#Ass_InventoryItem').jfGridValue('AAIId'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res, index) { - if (res) { - $.each(tempdatra, function (key, val) { - if (tempdatra[key].AAIId === keyValue) { - pricecount -= tempdatra[key].AAIPrice * tempdatra[key].AAIStock; - tempdatra.splice(key, 1); - } - }); - //$("#AOPrice").val(pricecount); - $('#Ass_InventoryItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber)); - top.layer.close(index); - } - }); - } - }); - page.bind(); page.initData(); }, bind: function () { $('#Ass_InventoryItem').jfGrid({ headData: [ + { + label: '是否盘点', name: 'AIsCheck', width: 150, align: 'left', formatter: function (cellvalue, row) { + if (cellvalue === true) { + return '已盘点'; + } else { + return '未盘点'; + } + } + }, + { + label: '盘点结果', name: 'AResult', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'InventoryResult', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '资产编号', name: 'AAICode', width: 150, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js index 4eae20700..c1b863f16 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js @@ -8,8 +8,8 @@ var refreshGirdData; var selectedRow; var bootstrap = function ($, learun) { "use strict"; - var startTime; - var endTime; + var startTime=''; + var endTime=''; var page = { init: function () { page.initGird(); @@ -193,6 +193,7 @@ var bootstrap = function ($, learun) { sidx: 'SendTime', sord: 'DESC' }); + page.search(); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js index dd7a38917..496a575d9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js @@ -158,7 +158,7 @@ var bootstrap = function ($, learun) { } }, { - label: "接收人/阅读数/发文章数", name: "Receiver", width: 300, align: "left" + label: "接收人/阅读数/总数", name: "Receiver", width: 300, align: "left" }, { label: "下发人", name: "Sender", width: 100, align: "left" diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 9de58d880..7ffeef151 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Web.Mvc; using Learun.Application.Organization; using Learun.Application.Base.AuthorizeModule; +using Learun.Application.TwoDevelopment.LR_LGManager; namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { @@ -18,6 +19,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers public class NWFProcessController : MvcControllerBase { private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); + LC_hetongIBLL lcHetongIbll=new LC_hetongBLL(); private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); @@ -291,6 +293,22 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + + [HttpGet] + [AjaxOnly] + public ActionResult GetContractList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = lcHetongIbll.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } /// /// 获取我的流程信息列表 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml index 59fcb8238..57d390d29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml @@ -2,21 +2,9 @@ ViewBag.Title = "流程监控"; Layout = "~/Views/Shared/_Index.cshtml"; } -
-
-
-
-
    -
  • 未完成
    • -
  • 已完成
    • -
  • 作废
    • -
-
-
-
- +
-
+
@@ -35,8 +23,6 @@
 查看 -  指派审核人 -  作废
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js index ccf66716c..2157f4ba1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js @@ -15,7 +15,6 @@ var bootstrap = function ($, learun) { var page = { init: function () { $('#lr_verify').hide(); - page.initleft(); page.initGrid(); page.bind(); }, @@ -110,70 +109,24 @@ var bootstrap = function ($, learun) { }); }, initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList', + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList', headData: [ - { - label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) { - if (row.F_SchemeName != row.F_Title && row.F_Title) { - return row.F_SchemeName + "(" + row.F_Title + ")"; - } - else { - return row.F_SchemeName; - } - } - }, - //{ - // label: "等级", name: "F_Level", width: 60, align: "center", - // formatter: function (cellvalue) { - // switch (cellvalue) { - // case 0: - // return '普通'; - // break; - // case 1: - // return '重要'; - // break; - // case 2: - // return '紧急'; - // break; - // default: - // return '普通'; - // break; - // } - // } - //}, - { - label: "状态", name: "F_EnabledMark", width: 70, align: "center", - formatter: function (cellvalue, row) { - if (row.F_IsFinished == 0) { - if (cellvalue == 1) { - if (row.F_IsUrge == "1" && categoryId == '2') { - return "催办加急"; - } - return "运行中"; - } else if (cellvalue == 2) { - return "草稿"; - } else { - return "作废"; - } - } - else { - return "结束"; - } - - } - }, - { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" }, - { - label: "时间", name: "F_CreateDate", width: 150, align: "left", - formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); - } - } + { label: '合同编号', name: 'LC_htbh', width: 200, align: "left" }, + { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" }, + { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" }, + { label: '申报人', name: 'F_ModifyUserName', width: 200, align: "left" }, + { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" }, + { label: '联系人', name: 'LC_dflxr', width: 120, align: "left" }, + { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" }, + { label: '合同开始时间', name: 'LC_htkssj', width: 200, align: "left" }, + { label: '合同结束时间', name: 'LC_htjssj', width: 200, align: "left" }, + { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" }, + { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" } ], mainId: 'F_Id', isPage: true, - sidx: 'F_CreateDate DESC', + sidx: 'F_ModifyDate DESC', dblclick: function () { page.eye(); } @@ -184,25 +137,14 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = logbegin; param.EndTime = logend; - param.categoryId = categoryId; + param.categoryId = 2; param.F_Category = '合同类'; - if (F_EnabledMark) { - param.F_EnabledMark = 3; - } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, eye: function () { - var processId = $('#gridtable').jfGridValue('F_Id') || ''; - var title = $('#gridtable').jfGridValue('F_Title'); - var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); - - if (schemeName != title && title) { - title = schemeName + "(" + title + ")"; - } - else { - title = schemeName; - } - + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('LC_htmc'); + if (learun.checkrow(processId)) { learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml index a755cca1a..178caea77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml @@ -15,9 +15,9 @@
  • 流程信息
    • -
    +
    -
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css index 6534bed3e..269576e53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css @@ -13,6 +13,7 @@ padding:10px; background-color:#f0f3f4; color:#58666e; + overflow: auto; } .lr-timeline ul { padding: 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/DesktopApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/DesktopApi.cs index 5fa297f23..dcf635abc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/DesktopApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/DesktopApi.cs @@ -71,6 +71,11 @@ namespace Learun.Application.WebApi.Modules string roleIds = "'" + loginUserInfo.roleIds.Replace(",", "','") + "'"; string companyId = loginUserInfo.companyId; string departmentId = loginUserInfo.departmentId; + if (string.IsNullOrEmpty(loginUserInfo.userId)) + { + userId = param.userid; + } + var dtListEntity = dTListIBLL.GetLR_DT_ListEntity(param.id); if (dtListEntity.F_Id == "33d50f1a-a64d-4b86-a6d4-2d937226de95") //待办 { @@ -110,78 +115,88 @@ namespace Learun.Application.WebApi.Modules dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("MMM", strSql.ToString()); } + if (!string.IsNullOrEmpty(dtListEntity.F_Sql) && dtListEntity.F_Sql.Contains("RUserId=@userId")) + { + dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("RUserId=@userId", "RUserId='" + userId + "'"); + } - var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql); - if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587") + if (!string.IsNullOrEmpty(dtListEntity.F_Sql)) { - dtnew = reqDataTable.Clone(); - for (int i = 0; i < reqDataTable.Rows.Count; i++) + var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql); + if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587") { - if (reqDataTable.Rows[i]["F_SendPostId"] != null && reqDataTable.Rows[i]["F_SendPostId"].ToString() != "") + dtnew = reqDataTable.Clone(); + for (int i = 0; i < reqDataTable.Rows.Count; i++) { - if (!string.IsNullOrEmpty(loginUserInfo.postIds)) + if (reqDataTable.Rows[i]["F_SendPostId"] != null && reqDataTable.Rows[i]["F_SendPostId"].ToString() != "") { - if (loginUserInfo.postIds.Contains(",")) + if (!string.IsNullOrEmpty(loginUserInfo.postIds)) { - foreach (var postid in loginUserInfo.postIds.Split(',')) + if (loginUserInfo.postIds.Contains(",")) { - if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(postid)) + foreach (var postid in loginUserInfo.postIds.Split(',')) + { + if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(postid)) + { + dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray); + break; + } + } + } + else + { + if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(loginUserInfo.postIds)) { dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray); - break; } } } - else + } + else + { + if (reqDataTable.Rows[i]["F_SendDeptId"] != null && reqDataTable.Rows[i]["F_SendDeptId"].ToString() != "") { - if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(loginUserInfo.postIds)) + if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId)) { dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray); } } - } - } - else - { - if (reqDataTable.Rows[i]["F_SendDeptId"] != null && reqDataTable.Rows[i]["F_SendDeptId"].ToString() != "") - { - if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId)) + else { dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray); } } - else - { - dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray); - } - } + } + jsonData = new + { + Id = param.id, + value = dtnew + }; } - jsonData = new + else { - Id = param.id, - value = dtnew - }; + jsonData = new + { + Id = param.id, + value = reqDataTable + + }; + } } - else + break; + case "chart": + var dtListEntity1 = dTChartIBLL.GetLR_DT_ChartEntity(param.id); + if (!string.IsNullOrEmpty(dtListEntity1.F_Sql)) { + var reqDataTable1 = databaseLinkIbll.FindTable(dtListEntity1.F_DataSourceId.Trim(), dtListEntity1.F_Sql); jsonData = new { Id = param.id, - value = reqDataTable - + value = reqDataTable1, }; } break; - case "chart": - var dtListEntity1 = dTChartIBLL.GetLR_DT_ChartEntity(param.id); - var reqDataTable1 = databaseLinkIbll.FindTable(dtListEntity1.F_DataSourceId.Trim(), dtListEntity1.F_Sql); - jsonData = new - { - Id = param.id, - value = reqDataTable1, - }; - break; } return Success(jsonData); } @@ -211,7 +226,7 @@ namespace Learun.Application.WebApi.Modules } } } - return Success(data.Select(m=>m.DistributedUrl)); + return Success(data.Select(m => m.DistributedUrl)); } } @@ -227,5 +242,6 @@ namespace Learun.Application.WebApi.Modules { public string type { get; set; } public string id { get; set; } + public string userid { get; set; } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/InventoryItemApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/InventoryItemApi.cs index adc3f1530..697cbec39 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/InventoryItemApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/InventoryItemApi.cs @@ -84,8 +84,8 @@ namespace Learun.Application.WebApi /// public Response GetFormByCode(dynamic _) { - var keyValue = GetReqData(); - var Ass_InventoryItemApplyData = inventoryItemIBLL.GetAss_InventoryItemApplyEntityByCode(keyValue); + var keyValue = GetReqData(); + var Ass_InventoryItemApplyData = inventoryItemIBLL.GetAss_InventoryItemApplyEntityByCode(keyValue.AAId,keyValue.acode); var jsonData = new { Ass_InventoryItemApply = Ass_InventoryItemApplyData @@ -93,6 +93,12 @@ namespace Learun.Application.WebApi return Success(jsonData); } + public class ACodeAAId + { + public string AAId { get; set; } + public string acode { get; set; } + } + #endregion #region  提交数据 @@ -118,6 +124,7 @@ namespace Learun.Application.WebApi { var parameter = GetReqData(); var entity = parameter.strEntity.ToObject(); + entity.AIsCheck = true; inventoryItemIBLL.SaveEntity(userInfo, parameter.keyValue, entity); return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs index ee3d82139..999fd1f22 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs @@ -251,7 +251,7 @@ namespace Learun.Application.WebApi.Modules if (!string.IsNullOrEmpty(responsejson)) { var weixintokenobj = JsonConvert.DeserializeObject(responsejson); - if (string.IsNullOrEmpty(weixintokenobj.errcode)) + if (string.IsNullOrEmpty(weixintokenobj.errcodeValue)) { string access_token = weixintokenobj.access_token; string jsapi_ticket = HttpGet("https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + access_token + "&type=jsapi"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs index 50420fb2c..76fb60589 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs @@ -219,6 +219,7 @@ namespace Learun.Application.OA this.F_ReleaseTime = DateTime.Now; this.F_DeleteMark = 0; this.F_EnabledMark = 1; + F_Status = "0"; this.F_PV = 0; UserInfo userInfo = LoginUserInfo.Get(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyBLL.cs index 4cab215bb..91b96a1db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyBLL.cs @@ -70,11 +70,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// 主键 /// /// - public Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string keyValue) + public Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string AAId, string ACode) { try { - return ass_AssetsOutItemApplyService.GetAss_InventoryItemApplyEntityByCode(keyValue); + return ass_AssetsOutItemApplyService.GetAss_InventoryItemApplyEntityByCode(AAId,ACode); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyEntity.cs index 805ad51d0..a68f4e918 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyEntity.cs @@ -105,7 +105,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// AAIREALNUM /// [Column("AISCHECK")] - public decimal? AIsCheck { get; set; } + public bool? AIsCheck { get; set; } /// /// AResult diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyIBLL.cs index c4df49876..ce54d8dc2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyIBLL.cs @@ -27,7 +27,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// /// Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntity(string keyValue); - Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string keyValue); + Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string AAId, string ACode); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyService.cs index 99ebd475a..a9f6c9d37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyService.cs @@ -30,30 +30,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.AAIId, - t.AAId, - t.AAICode, - t.AAITId, - t.AAIName, - t.AAIEName, - t.AAIPhoto, - t.AAIContent, - t.AAIOrder, - t.AAIModel, - t.AAIManufacturer, - t.AAISupplierId, - t.AAISource, - t.AAIPrice, - t.AAISTOCK, - t.AAIUNIT, - t.AIsCheck, - t.AResult, - t.ARemark, - t.AAddress, - t.AAIREALNUM - "); + strSql.Append("SELECT * "); strSql.Append(" FROM Ass_InventoryItemApply t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); @@ -123,11 +100,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// 主键 /// /// - public Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string keyValue) + public Ass_InventoryItemApplyEntity GetAss_InventoryItemApplyEntityByCode(string AAId,string ACode) { try { - return this.BaseRepository().FindEntity(a => a.AAICode == keyValue); + return this.BaseRepository().FindEntity(a => a.AAICode == ACode&&a.AAId== AAId); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongBLL.cs new file mode 100644 index 000000000..b2cc14b4f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-21 17:48 + /// 描 述：LC_hetong + /// + public class LC_hetongBLL : LC_hetongIBLL + { + private LC_hetongService lC_hetongService = new LC_hetongService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return lC_hetongService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return lC_hetongService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public LC_hetongEntity GetEntity(string keyValue) + { + try + { + return lC_hetongService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + lC_hetongService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, LC_hetongEntity entity) + { + try + { + lC_hetongService.SaveEntity(keyValue, entity); + } + 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/LR_LGManager/LC_hetong/LC_hetongIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongIBLL.cs new file mode 100644 index 000000000..bc080a63e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongIBLL.cs @@ -0,0 +1,55 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-21 17:48 + /// 描 述：LC_hetong + /// + public interface LC_hetongIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + LC_hetongEntity GetEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, LC_hetongEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongService.cs new file mode 100644 index 000000000..9e0c10813 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongService.cs @@ -0,0 +1,216 @@ +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.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-21 17:48 + /// 描 述：LC_hetong + /// + public class LC_hetongService : RepositoryFactory + { + #region 构造函数和属性 + + private string fieldSql; + /// + /// 构造方法 + /// + public LC_hetongService() + { + fieldSql = @" + t.LC_ID, + t.F_EnabledMark, + t.F_ModifyUserName, + t.F_SortCode, + t.F_ModifyDate, + t.F_CreateUserName, + t.F_CreateDate, + t.F_Description, + t.LC_htkssj, + t.LC_htjssj, + t.LC_qdrq, + t.LC_htlx, + t.LC_htmc, + t.LC_htbd, + t.LC_htbh, + t.LC_htzje, + t.LC_wenben, + t.LC_gzfs, + t.LC_dfdw, + t.LC_dflxr, + t.LC_dfdh, + t.LC_csyj, + t.LC_csyjqt, + t.LC_sfty, + t.LC_fujian, + t.LC_beizhu, + t.LC_hqcyj, + t.LC_zgldyj, + t.LC_cwcyj, + t.LC_bgsyj, + t.OperationTime, + t.LC_CheckMark, + t.LC_sqwtr + "; + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + //参考写法 + //var queryParam = queryJson.ToJObject(); + // 虚拟参数 + //var dp = new DynamicParameters(new { }); + //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM LC_hetong t "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 条件参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM LC_hetong t left join adms7ultimate2.dbo.LR_NWF_Process b on t.lc_id=b.f_id where b.F_IsFinished=1 and b.F_EnabledMark!=2 and F_IsChild=0 "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public LC_hetongEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(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.LC_ID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, LC_hetongEntity 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 + + } +} 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 46271361a..42c39c444 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 @@ -268,7 +268,10 @@ + + +