From 0e1b33b894b48d5b86fa33da277d574e0ba12bab Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期三, 30 十月 2024 11:21:52 +0800 Subject: [PATCH] 接口更新 --- MES.Service/service/BasicData/MesUnitManager.cs | 5 -- MES.Service/service/BasicData/MesStaffManager.cs | 6 -- MES.Service/service/BasicData/MesCustomerManager.cs | 5 -- MES.Service/service/BasicData/OrganizeManager.cs | 5 -- MES.Service/service/BasicData/MesSupplierManager.cs | 5 -- MES.Service/service/BasicData/MesPositionManager.cs | 6 -- MES.Service/service/BasicData/MesRohInDataManager.cs | 67 --------------------------------- MES.Service/service/BasicData/MesDepotsManager.cs | 6 -- MES.Service/service/BasicData/MesItemsManager.cs | 5 -- MES.Service/service/BasicData/SysDepartmentManager.cs | 6 -- 10 files changed, 10 insertions(+), 106 deletions(-) diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs index 8870f95..aeb8abe 100644 --- a/MES.Service/service/BasicData/MesCustomerManager.cs +++ b/MES.Service/service/BasicData/MesCustomerManager.cs @@ -62,14 +62,11 @@ "B")) throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertCustomerBatch(db, customerGroup.Value)) - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteCustomerBatch(db, customerGroup.Value)) throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, customerGroup.Value)) throw new NotImplementedException("鍚屾澶辫触"); diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs index b007c92..6f5da5a 100644 --- a/MES.Service/service/BasicData/MesDepotsManager.cs +++ b/MES.Service/service/BasicData/MesDepotsManager.cs @@ -136,16 +136,12 @@ "B")) // 鎵归噺绂佺敤浠撳簱 throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertDepotBatch(db, - depotsGroup.Value)) // 鎵归噺鎻掑叆浠撳簱 - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteDepotBatch(db, depotsGroup.Value)) // 鎵归噺鍒犻櫎浠撳簱 throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, depotsGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴� diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs index 8924a9c..52a92ad 100644 --- a/MES.Service/service/BasicData/MesItemsManager.cs +++ b/MES.Service/service/BasicData/MesItemsManager.cs @@ -60,14 +60,11 @@ if (!UpdateItemStatusBatch(db, itemGroup.Value, "B")) throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertItemBatch(db, itemGroup.Value)) - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteItemBatch(db, itemGroup.Value)) throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, itemGroup.Value)) throw new NotImplementedException("鍚屾澶辫触"); diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs index 60725e1..6b67858 100644 --- a/MES.Service/service/BasicData/MesPositionManager.cs +++ b/MES.Service/service/BasicData/MesPositionManager.cs @@ -130,16 +130,12 @@ "B")) // 鎵归噺绂佺敤宀椾綅 throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertPositionBatch(db, - positionGroup.Value)) // 鎵归噺鎻掑叆宀椾綅 - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeletePositionBatch(db, positionGroup.Value)) // 鎵归噺鍒犻櫎宀椾綅 throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdatePositionBatch(db, positionGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣� diff --git a/MES.Service/service/BasicData/MesRohInDataManager.cs b/MES.Service/service/BasicData/MesRohInDataManager.cs index 7385023..9862bd1 100644 --- a/MES.Service/service/BasicData/MesRohInDataManager.cs +++ b/MES.Service/service/BasicData/MesRohInDataManager.cs @@ -9,70 +9,5 @@ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉� //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesRohInDataManager.cs - - - #region 鏁欏鏂规硶 - - /// <summary> - /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉� - /// </summary> - public void Study() - { - /*********鏌ヨ*********/ - - var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ - var data2 = base.GetList(); //鏌ヨ鎵�鏈� - var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ - //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊 - - var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ - var data5 = base.GetPageList(it => 1 == 1, p); - Console.Write(p.TotalCount); //杩斿洖鎬绘暟 - - var data6 = - base.GetPageList(it => 1 == 1, p, - it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴� - Console.Write(p.TotalCount); //杩斿洖鎬绘暟 - - var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴� - conModels.Add(new ConditionalModel - { - FieldName = typeof(MesRohInData).GetProperties()[0].Name, - ConditionalType = ConditionalType.Equal, FieldValue = "1" - }); //id=1 - var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); - - AsQueryable().Where(x => 1 == 1) - .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘 - - - /*********鎻掑叆*********/ - var insertData = new MesRohInData(); //娴嬭瘯鍙傛暟 - var insertArray = new[] { insertData }; - base.Insert(insertData); //鎻掑叆 - base.InsertRange(insertArray); //鎵归噺鎻掑叆 - var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒� - AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆 - - - /*********鏇存柊*********/ - var updateData = new MesRohInData(); //娴嬭瘯鍙傛暟 - var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟 - base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊 - base.UpdateRange(updateArray); //鎵归噺鏇存柊 - //base.Update(it => new MesRohInData() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1 - AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏� - - - /*********鍒犻櫎*********/ - var deldata = new MesRohInData(); //娴嬭瘯鍙傛暟 - base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎 - base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎 - base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎 - base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎 - AsDeleteable().Where(it => 1 == 2) - .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣� - } - - #endregion + } \ No newline at end of file diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs index e1d0ea8..776945d 100644 --- a/MES.Service/service/BasicData/MesStaffManager.cs +++ b/MES.Service/service/BasicData/MesStaffManager.cs @@ -162,16 +162,12 @@ "B")) // 鎵归噺绂佺敤鍛樺伐 throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertStaffBatch(db, userList, - staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐 - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteStaffBatch(db, userList, staffGroup.Value)) // 鎵归噺鍒犻櫎鍛樺伐 throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, userList, staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸� diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs index 6c196a5..f1bf516 100644 --- a/MES.Service/service/BasicData/MesSupplierManager.cs +++ b/MES.Service/service/BasicData/MesSupplierManager.cs @@ -62,14 +62,11 @@ "B")) throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertSupplierBatch(db, supplierGroup.Value)) - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteSupplierBatch(db, supplierGroup.Value)) throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, supplierGroup.Value)) throw new NotImplementedException("鍚屾澶辫触"); diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs index fdf6280..145f80f 100644 --- a/MES.Service/service/BasicData/MesUnitManager.cs +++ b/MES.Service/service/BasicData/MesUnitManager.cs @@ -60,14 +60,11 @@ if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B")) throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertUnitBatch(db, unitGroup.Value)) - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteUnitBatch(db, unitGroup.Value)) throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, unitGroup.Value)) throw new NotImplementedException("鍚屾澶辫触"); diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs index d499c64..76e863d 100644 --- a/MES.Service/service/BasicData/OrganizeManager.cs +++ b/MES.Service/service/BasicData/OrganizeManager.cs @@ -60,14 +60,11 @@ if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B")) throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertItemBatch(db, itemGroup.Value)) - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteItemBatch(db, itemGroup.Value)) throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateBatch(db, itemGroup.Value)) throw new NotImplementedException("鍚屾澶辫触"); diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs index fd28c5c..ca70322 100644 --- a/MES.Service/service/BasicData/SysDepartmentManager.cs +++ b/MES.Service/service/BasicData/SysDepartmentManager.cs @@ -143,16 +143,12 @@ departmentGroup.Value, "B")) // 鎵归噺绂佺敤閮ㄩ棬 throw new NotImplementedException("绂佺敤澶辫触"); break; - case "2": - if (!InsertDepartmentBatch(db, - departmentGroup.Value)) // 鎵归噺鎻掑叆閮ㄩ棬 - throw new NotImplementedException("鎻掑叆澶辫触"); - break; case "3": if (!DeleteDepartmentBatch(db, departmentGroup.Value)) // 鎵归噺鍒犻櫎閮ㄩ棬 throw new NotImplementedException("鍒犻櫎澶辫触"); break; + case "2": case "4": if (!InsertOrUpdateDepartmentBatch(db, departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂� -- Gitblit v1.9.3