From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析，生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件
---
VueWebCoreApi/Controllers/BasicSettingController.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index 53dc6bf..bdd966d 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -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
--
Gitblit v1.9.3