From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 2014c78..1def813 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -34,18 +34,27 @@
/// <param name="id"></param>
/// <returns></returns>
SysStorageLocat GetStorageLocat(int id);
+
+
+ /// <summary>
+ /// 鏌ヨ澶氭潯鍌ㄤ綅淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ List<SysStorageLocat> GetStorageLocat();
+
/// <summary>
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocat(EditLocateVm model, string url,int userId);
+ bool EditStorageLocat(EditLocateVm model, string url, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
/// <param name="locateNo">鍌ㄤ綅鍙�</param>
+ /// <param name="index">褰撳墠鎺�</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -55,7 +64,7 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
+ Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堝钩搴擄級鐢ㄤ簬寮�鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
@@ -77,7 +86,7 @@
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocatList(EditLocateListVm model,string url, int userId);
+ bool EditStorageLocatList(EditLocateListVm model, string url, int userId);
/// <summary>
/// 鑾峰彇鍌ㄤ綅淇℃伅
--
Gitblit v1.8.0