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/DeviceManagerController.cs | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/VueWebCoreApi/Controllers/DeviceManagerController.cs b/VueWebCoreApi/Controllers/DeviceManagerController.cs
index 6084e0a..979de29 100644
--- a/VueWebCoreApi/Controllers/DeviceManagerController.cs
+++ b/VueWebCoreApi/Controllers/DeviceManagerController.cs
@@ -24,37 +24,32 @@
/// <summary>
/// 璁惧绫诲瀷鏌ヨ
/// </summary>
- /// <param name="page">椤电爜</param>
- /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
- /// <param name="prop">鎺掑簭瀛楁</param>
- /// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
[Route(template: "DeviceTypeSearch")]
[HttpGet]
- public JsonResult DeviceTypeSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult DeviceTypeSearch()
{
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 = DeviceManagerBLL.DeviceTypeSearch(startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceTypeSearch();
return Json(mes);
}
#endregion
- #region[璁惧绫诲瀷鏂板]
+ #region[璁惧绫诲瀷鏂板/缂栬緫]
/// <summary>
- /// 璁惧绫诲瀷鏂板
+ /// 璁惧绫诲瀷鏂板/缂栬緫
/// </summary>
+ /// <param name="OperType">鎿嶄綔绫诲瀷(Add/Update)</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
[Route(template: "AddUpdateDeviceType")]
[HttpPost]
- public JsonResult AddUpdateDeviceType(List<ObjectDataCont> json)
+ public JsonResult AddUpdateDeviceType(string OperType,List<ObjectDataCont> json)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- mes = DeviceManagerBLL.AddUpdateDeviceType(json, us);
+ mes = DeviceManagerBLL.AddUpdateDeviceType(OperType,json, us);
return Json(mes);
}
#endregion
--
Gitblit v1.9.3