From 9445c4660740dc8a544b5c2440fe365a218bab12 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 26 十月 2023 17:26:39 +0800
Subject: [PATCH] 1.修改仓位信息列表接口 2.新增仓库库位基础资料接口 3.修改模具出入库提交接口(增加库位) 、模具清单增加库位 4.新增模具上下机记录报表、模具借还记录报表
---
VueWebCoreApi/Controllers/BasicSettingController.cs | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 8 deletions(-)
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index 6ddba30..a1fc254 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -31,20 +31,14 @@
/// </summary>
/// <param name="storg_code">缁勭粐缂栫爜</param>
/// <param name="storg_name">缁勭粐鍚嶇О</param>
- /// <param name="page">椤电爜</param>
- /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
- /// <param name="prop">鎺掑簭瀛楁</param>
- /// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
[Route(template: "STorgData")]
[HttpGet]
- public JsonResult STorgData(string storg_code,string storg_name, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult STorgData(string storg_code,string storg_name)
{
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.STorgData(storg_code,storg_name,startNum,endNum,prop,order);
+ mes = BasicSettingBLL.STorgData(storg_code,storg_name);
return Json(mes);
}
#endregion
@@ -678,5 +672,161 @@
return Json(mes);
}
#endregion
+
+
+ #region[浠撲綅鏍戝瀷淇℃伅]
+ /// <summary>
+ /// 浠撲綅鏍戝瀷淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "TSecLocaTree")]
+ [HttpGet]
+ public JsonResult TSecLocaTree()
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = BasicSettingBLL.TSecLocaTree();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[浠撲綅淇℃伅鍒楄〃]
+ /// <summary>
+ /// 浠撲綅淇℃伅鍒楄〃
+ /// </summary>
+ /// <param name="flag">閫変腑宸︿晶鏍戝瀷鏄惁浠撳簱(Y/N)</param>
+ /// <param name="stckcode">浠撳簱缂栫爜瀛楃涓查泦</param>
+ /// <param name="locacode">浠撲綅缂栫爜</param>
+ /// <param name="locaname">浠撲綅鍚嶇О</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "TSecLocaData")]
+ [HttpGet]
+ 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(flag,stckcode, locacode, locaname, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨]
+ /// <summary>
+ /// 浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "TSecLocaAddUpdate")]
+ [HttpPost]
+ public JsonResult TSecLocaAddUpdate([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string data_sources = obj["data_sources"].ToString(); //鏁版嵁鏉ユ簮:ERP/MES
+ string locacode = obj["locacode"].ToString(); //璐т綅缂栫爜
+ string locaname = obj["locaname"].ToString(); //璐т綅鍚嶇О
+ string stckcode = obj["stckcode"].ToString(); //瀵瑰簲浠撳簱缂栫爜
+ string parentlocacode = obj["parentlocacode"].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);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[浠撲綅淇℃伅鍒犻櫎]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="data_sources">鏁版嵁鏉ユ簮:ERP/MES</param>
+ /// <param name="locacode">浠撳簱缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "TSecLocaDelete")]
+ [HttpPost]
+ public JsonResult TSecLocaDelete(string data_sources, string locacode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = BasicSettingBLL.TSecLocaDelete(data_sources, locacode, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[宸ュ簭鏌ヨ]
+ /// <summary>
+ /// 宸ュ簭鏌ヨ
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="stepname">宸ュ簭鍚嶇О</param>
+ /// <param name="enable">鍚敤鐘舵��</param>
+ /// <param name="steptypecode">宸ュ簭绫诲瀷缂栫爜</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "StepSearch")]
+ [HttpGet]
+ public JsonResult StepSearch(string stepcode = null, string stepname = null, string enable = null, string steptypecode = null,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.StepSearch(stepcode, stepname, enable, steptypecode, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭鏂板缂栬緫]
+ /// <summary>
+ /// 宸ュ簭鏂板缂栬緫
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateStep")]
+ [HttpPost]
+ public JsonResult AddUpdateStep([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string stepid = obj["id"].ToString(); //宸ュ簭id(涓婚敭)
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string stepname = obj["stepname"].ToString(); //宸ュ簭鍚嶇О
+ string steptypecode = obj["steptypecode"].ToString(); //宸ュ簭绫诲瀷缂栫爜
+ string enable = obj["enable"].ToString(); //鍚敤鐘舵��
+ string description = obj["description"].ToString(); //宸ュ簭鎻忚堪
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = BasicSettingBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, us, OperType);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭鍒犻櫎]
+ /// <summary>
+ /// 宸ュ簭鍒犻櫎
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteStep")]
+ [HttpPost]
+ public JsonResult DeleteStep(string stepcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = BasicSettingBLL.DeleteStep(stepcode,us);
+ return Json(mes);
+ }
+ #endregion
+
+
}
}
--
Gitblit v1.9.3