From fe2b27527084667a15c424ffba00052cbf35ef7f Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 15 七月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f3ffb62..a6ea852 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -120,11 +120,11 @@
}
- public bool EditStorageLocat(EditLocateVm model,string url ,int userId)
+ public bool EditStorageLocat(EditLocateVm model, string url, int userId)
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature,url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -137,6 +137,7 @@
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
+ /// <param name="index">褰撳墠鎺掓暟</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -146,14 +147,14 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public async Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
+ public async Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
{
try
{
var q = 0;
//R01 -01 -01 -02
//宸烽亾鈥撴帓-鍒�-灞�
- for (int r = 12; r <= row; r++)//鎺�
+ for (int r = index; r <= row; r++)//鎺�
{
var r1 = "1";
if (r < 10)
@@ -267,7 +268,7 @@
}
}
- public bool EditStorageLocatList(EditLocateListVm model,string url, int userId)
+ public bool EditStorageLocatList(EditLocateListVm model, string url, int userId)
{
try
{
--
Gitblit v1.8.0