From 291558a5ddd495195047a23a27b44ce5b0bbca5a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 15 十一月 2024 11:06:00 +0800
Subject: [PATCH] 1.T8入库记录(查询、删除) 2.T+入库记录(查询、删除) 3.生产入库记录查询增加部门查询条件 4.看板视图根据配置文件区分T8还是T+
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 0e3fc37..cb1ae13 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -801,6 +801,7 @@
/// <summary>
/// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
/// </summary>
+ /// <param name="deptno">閮ㄩ棬缂栫爜(T8浣跨敤)</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="erpordercode">璁㈠崟缂栧彿</param>
@@ -811,9 +812,9 @@
/// <returns></returns>
[Route(template: "ProductInHouseOrderSearch")]
[HttpGet]
- public JsonResult ProductInHouseOrderSearch(string saleordercode, string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null)
+ public JsonResult ProductInHouseOrderSearch(string deptno, string saleordercode, string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null)
{
- mes = WorkOrderBLL.ProductInHouseOrderSearch(saleordercode,wkshopcode, erpordercode, mesordercode, partcode, partname, partspec);
+ mes = WorkOrderBLL.ProductInHouseOrderSearch(deptno,saleordercode, wkshopcode, erpordercode, mesordercode, partcode, partname, partspec);
return Json(mes);
}
#endregion
@@ -833,9 +834,23 @@
}
#endregion
- #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦]
+ #region[閫氭槗T8鐢熶骇鍏ュ簱鑾峰彇閮ㄩ棬淇℃伅]
/// <summary>
- /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦
+ /// 閫氭槗T8鐢熶骇鍏ュ簱鑾峰彇閮ㄩ棬淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeptSelectData")]
+ [HttpGet]
+ public JsonResult DeptSelectData()
+ {
+ mes = WorkOrderBLL.DeptSelectData();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-浠ｇ爜鐗圿
+ /// <summary>
+ /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-浠ｇ爜鐗�
/// </summary>
/// <param name="data">鎻愪氦鏁版嵁</param>
/// <returns></returns>
@@ -850,5 +865,40 @@
return Json(mes);
}
#endregion
+
+ #region[閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)]
+ /// <summary>
+ /// 閫氭槗T8鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)
+ /// </summary>
+ /// <param name="data">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSpSeave")]
+ [HttpPost]
+ public JsonResult ProductInHouseOrderSpSeave(InReptModel data)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ //var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OTkiLCJ1c2VybmFtZSI6Iuezu-e7n-euoeeQhuWRmCIsInN0b3JnX2NvZGUiOiIiLCJzdG9yZ19uYW1lIjoiIiwiaXNfc3lzdGVtX2FkbWluIjoiWSIsInJvbGVfY29kZSI6IiIsInJvbGVfZGF0YXBlcm1pc3Npb25zIjoiIiwidXNlcnR5cGUiOiJQQyIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURQQzk5OTkiLCJtZXNTZXR0aW5nIjoie1wicm91dGVcIjp0cnVlLFwiaXNPcmRlclwiOnRydWUsXCJkZXZpY2VcIjp0cnVlLFwidGVjaFwiOnRydWUsXCJ3b3JrT3JkZXJcIjp0cnVlLFwiZXZlcnlcIjpmYWxzZSxcImxhc3RcIjpmYWxzZX0iLCJ0aW1lb3V0IjoiMjAyNC0xMC0yNFQxMjozNTo1MC4zNDI1NzE2KzA4OjAwIn0.Nbc-1sXd4QLLsnj8wH9XC7iWEmP0wDG82gwLxIh94e4";
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.ProductInHouseOrderSpSeave(data, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐣呮嵎閫歍+鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)]
+ /// <summary>
+ /// 鐣呮嵎閫歍+鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)
+ /// </summary>
+ /// <param name="data">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "TProductInHouseOrderSpSeave")]
+ [HttpPost]
+ public JsonResult TProductInHouseOrderSpSeave(InReptModel data)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.TProductInHouseOrderSpSeave(data, us);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3