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/GeneralBasicDataController.cs | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 1 deletions(-)
diff --git a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
index b56d142..ef96945 100644
--- a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
+++ b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
@@ -15,7 +15,7 @@
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
ToMessage mes = new ToMessage();
- RedisHelper redis = new RedisHelper();
+ RedisCommon redis = new RedisCommon();
#region[缁勭粐鏋舵瀯鍩虹璧勬枡]
/// <summary>
@@ -27,6 +27,20 @@
public JsonResult PrentOrganization()
{
mes = GeneralBasicDataBLL.PrentOrganization();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)]
+ /// <summary>
+ /// 缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "PrentOrganizationNoCompany")]
+ [HttpGet]
+ public JsonResult PrentOrganizationNoCompany()
+ {
+ mes = GeneralBasicDataBLL.PrentOrganizationNoCompany();
return Json(mes);
}
#endregion
@@ -183,6 +197,35 @@
}
#endregion
+ #region[浠撳簱搴撲綅鍩虹璧勬枡]
+ /// <summary>
+ /// 浠撳簱搴撲綅鍩虹璧勬枡
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WareHouseLocation")]
+ [HttpGet]
+ public JsonResult WareHouseLocation()
+ {
+ mes = GeneralBasicDataBLL.WareHouseLocation();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[浠撳簱鏌ユ壘浠撲綅淇℃伅]
+ /// <summary>
+ /// 浠撳簱鏌ユ壘浠撲綅淇℃伅
+ /// </summary>
+ /// <param name="warhousecode">浠撳簱缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WareHouseSelectLocation")]
+ [HttpGet]
+ public JsonResult WareHouseSelectLocation(string warhousecode)
+ {
+ mes = GeneralBasicDataBLL.WareHouseSelectLocation(warhousecode);
+ return Json(mes);
+ }
+ #endregion
+
#region[宸ュ簭鍩虹璧勬枡]
/// <summary>
/// 宸ュ簭鍩虹璧勬枡
@@ -220,5 +263,47 @@
return Json(mes);
}
#endregion
+
+ #region[瀛樿揣鏍戝瀷鍩虹璧勬枡]
+ /// <summary>
+ /// 瀛樿揣鏍戝瀷鍩虹璧勬枡
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "InventoryTreePermissions")]
+ [HttpGet]
+ public JsonResult InventoryTreePermissions()
+ {
+ mes = GeneralBasicDataBLL.InventoryTreePermissions();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿妫�楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 妯″叿妫�楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MouldCheckItemSelect")]
+ [HttpGet]
+ public JsonResult MouldCheckItemSelect()
+ {
+ mes = GeneralBasicDataBLL.MouldCheckItemSelect();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤圭洰涓嬫媺鍒楄〃]
+ /// <summary>
+ /// 妯″叿淇濆吇椤圭洰涓嬫媺鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MouldRepairItemSelect")]
+ [HttpGet]
+ public JsonResult MouldRepairItemSelect()
+ {
+ mes = GeneralBasicDataBLL.MouldRepairItemSelect();
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3