From 39f66c32212f11d9a9d41c69e37f68e989c55cde Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 08 十二月 2025 10:56:23 +0800
Subject: [PATCH] 1.报工调整增加工序查询条件 2.报工调整增加批量改价 3.生产订单、生产工单车间查询条件改为多选
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index da766e5..c5e967f 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -20,7 +20,7 @@
[ApiExplorerSettings(GroupName = "宸ュ崟绠＄悊")]
[ApiController]
[Route("api/[controller]")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class WorkOrderController : Controller
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -733,6 +733,7 @@
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="reportuser">鎶ュ伐浜哄憳</param>
/// <param name="reportdate">鎶ュ伐鏃堕棿</param>
/// <param name="page">椤电爜</param>
@@ -742,7 +743,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepcode=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -753,7 +754,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -796,6 +797,23 @@
}
#endregion
+ #region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鎵归噺鏀逛环鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐璋冩暣鎵归噺鏀逛环鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepPriceBatchUpdateSeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepPriceBatchUpdateSeave(List<BatchPrice> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepPriceBatchUpdateSeave(us, json);
+ return Json(mes);
+ }
+ #endregion
+
#region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
--
Gitblit v1.9.3