diff --git a/dp-library b/dp-library index 7c720d93..6adf219a 160000 --- a/dp-library +++ b/dp-library @@ -1 +1 @@ -Subproject commit 7c720d93adddb3212df9325f29c3caaf683312d3 +Subproject commit 6adf219a4020b7ad374dc8d64cda43644d0fffc0 diff --git a/dp2weixin.service/SearchBiblioResult.cs b/dp2weixin.service/SearchBiblioResult.cs index 73eef4f1..2953c7c7 100644 --- a/dp2weixin.service/SearchBiblioResult.cs +++ b/dp2weixin.service/SearchBiblioResult.cs @@ -79,6 +79,7 @@ public class SearchItemResult public class BiblioItem { + //序号 public string no = ""; @@ -87,6 +88,9 @@ public class BiblioItem public string barcode { get; set; }//这个barcode值:如果有册条码号为册条码,没有值为@refID: public string pureBarcode { get; set; }//册条码号 + // 2023/4/7增加 + public string Timestamp { get; set; } + public string state { get; set; } //状态 public string volume { get; set; } //卷册 diff --git a/dp2weixin.service/dp2WeiXinService.cs b/dp2weixin.service/dp2WeiXinService.cs index 26fc3c0b..4421d0c0 100644 --- a/dp2weixin.service/dp2WeiXinService.cs +++ b/dp2weixin.service/dp2WeiXinService.cs @@ -8914,7 +8914,8 @@ public class Record Record oldRecord = new Record(); oldRecord.RecPath = item.recPath; - //oldRecord.Timestamp = timestamp; + + oldRecord.Timestamp = item.Timestamp;// 2023/4/7现在dp2端需要时间戳参数,原来的接口不需要时间戳也能删除, entity.OldRecord = oldRecord; } @@ -9326,14 +9327,17 @@ public long GetItemInfo(string weixinId, //为了获取libraryCode for (int i = 0; i < recordList.Count; i++) { - - string xml = recordList[i].Data;//result.Records[i].Data; + Record r= recordList[i];//result.Records[i].Data; + string xml = r.Data; BiblioItem item = ParseItemXml(weixinId, loginInfo, lib, xml, containReservationInfo); if (item == null) continue; item.biblioPath=biblioPath; item.recPath = this.GetPurePath(recordList[i].RecPath); + // 2023/4/7 要加上时间戳,否则没法编辑和删除 + item.Timestamp= r.Timestamp; + //===== // 检查数据库是否为期刊库,如果是期库,取出期的照片 @@ -9508,7 +9512,9 @@ bool containReservationInfo //是否获取借书详情和预约详情 int index1 = item.location.IndexOf("/"); if (index1 > 0) tempLibCode = item.location.Substring(0, index1); - if (activeUser.libraryCode != tempLibCode) + + //2023/4/7 修改,有的工作人员管理多个馆 + if (StringUtil.IsInList(tempLibCode, activeUser.libraryCode) == false)// != tempLibCode) { item.isGray = true; item.location += "(非本馆-不可操作)"; diff --git a/dp2weixinP2P/Scripts/weixin.js b/dp2weixinP2P/Scripts/weixin.js index 61aef2c6..0f1fb2bc 100644 --- a/dp2weixinP2P/Scripts/weixin.js +++ b/dp2weixinP2P/Scripts/weixin.js @@ -115,7 +115,7 @@ function gotoEditItem(biblioPath, biblioName) { } // 删除册 -function deleteItem(worker,libId,biblioPath,itemPath,barcode) { +function deleteItem(worker, libId, biblioPath, itemPath, barcode, timestamp) { var gnl = confirm("您确认要删除册[" + barcode + "]吗?"); if (gnl == false) { @@ -161,7 +161,8 @@ function deleteItem(worker,libId,biblioPath,itemPath,barcode) { alert(errorThrown); }, { - recPath: itemPath + recPath: itemPath, + Timestamp: timestamp } ); } @@ -574,7 +575,7 @@ function getItemHtml(libId,record,showDeleteButton) { itemTables += "" + "" //+ "" - + "" + + "" + " " + ""; } diff --git a/dp2weixinP2P/Views/Shared/_Layout.cshtml b/dp2weixinP2P/Views/Shared/_Layout.cshtml index 8d87f6b8..74cee524 100644 --- a/dp2weixinP2P/Views/Shared/_Layout.cshtml +++ b/dp2weixinP2P/Views/Shared/_Layout.cshtml @@ -13,7 +13,7 @@ - + diff --git a/dp2weixinP2P/Views/Shared/_LayoutEmpty.cshtml b/dp2weixinP2P/Views/Shared/_LayoutEmpty.cshtml index 7ec8d729..b50ace04 100644 --- a/dp2weixinP2P/Views/Shared/_LayoutEmpty.cshtml +++ b/dp2weixinP2P/Views/Shared/_LayoutEmpty.cshtml @@ -13,7 +13,7 @@ - + diff --git a/dp2weixinP2P/Views/Shared/_LayoutManager.cshtml b/dp2weixinP2P/Views/Shared/_LayoutManager.cshtml index 53b46be6..b4e64113 100644 --- a/dp2weixinP2P/Views/Shared/_LayoutManager.cshtml +++ b/dp2weixinP2P/Views/Shared/_LayoutManager.cshtml @@ -12,7 +12,7 @@ - + @RenderSection("style", required: false)