From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/Controllers/BasicSettingController.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index ce1af13..093f5df 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -23,7 +23,7 @@
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
ToMessage mes = new ToMessage();
- RedisHelper redis = new RedisHelper();
+ RedisCommon redis = new RedisCommon();
#region[缁勭粐鏋舵瀯,鏌ヨ缁勭粐淇℃伅]
/// <summary>
@@ -694,6 +694,7 @@
/// <summary>
/// 浠撲綅淇℃伅鍒楄〃
/// </summary>
+ /// <param name="flag">閫変腑宸︿晶鏍戝瀷灞傜骇</param>
/// <param name="stckcode">浠撳簱缂栫爜瀛楃涓查泦</param>
/// <param name="locacode">浠撲綅缂栫爜</param>
/// <param name="locaname">浠撲綅鍚嶇О</param>
@@ -704,13 +705,13 @@
/// <returns></returns>
[Route(template: "TSecLocaData")]
[HttpGet]
- public JsonResult TSecLocaData(string stckcode, string locacode, string locaname, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult TSecLocaData(string flag, string stckcode, string locacode, string locaname, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.TSecLocaData(stckcode, locacode, locaname, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.TSecLocaData(flag,stckcode, locacode, locaname, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -732,10 +733,11 @@
string locaname = obj["locaname"].ToString(); //璐т綅鍚嶇О
string stckcode = obj["stckcode"].ToString(); //瀵瑰簲浠撳簱缂栫爜
string parentlocacode = obj["parentlocacode"].ToString(); //涓婄骇璐т綅缂栫爜
+ string depth = obj["depth"].ToString(); //绾ф
string status = obj["status"].ToString(); //鐘舵��
string description = obj["description"].ToString(); //澶囨敞
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.TSecLocaAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, status, description, OperType, us);
+ mes = BasicSettingBLL.TSecLocaAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, depth, status, description, OperType, us);
return Json(mes);
}
#endregion
@@ -825,5 +827,7 @@
return Json(mes);
}
#endregion
+
+
}
}
--
Gitblit v1.9.3