From 0c0a49144242879f97d1880caf0f8fe6c9afe950 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 27 三月 2026 17:07:46 +0800
Subject: [PATCH] 1.增加节拍工价导入(工艺路线版本、工序版本) 2.增加MES工单批量查找历史引用最新工艺信息接口MesOrderNewStepListContent
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index bc32548..a341cde 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
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -377,6 +377,23 @@
}
#endregion
+ #region[MES宸ュ崟鎵归噺鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭痌
+ /// <summary>
+ /// MES宸ュ崟鎵归噺鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
+ /// </summary>
+ /// <param name="list">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderNewStepListContent")]
+ [HttpPost]
+ public JsonResult MesOrderNewStepListContent(List<BatchProcess> list)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderNewStepListContent(list, us);
+ return Json(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏌ョ湅宸ュ崟SOP]
/// <summary>
/// MES宸ュ崟鏌ョ湅宸ュ崟SOP
@@ -505,6 +522,8 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
+ /// <param name="saorderno">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -515,13 +534,13 @@
/// <returns></returns>
[Route(template: "MesOrderStepSearch")]
[HttpGet]
- public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null,string orderno = null,string saorderno=null, string partcode = null, string partname = null, string partspec = 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 = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, orderno, saorderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -532,6 +551,8 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
+ /// <param name="saorderno">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -542,13 +563,13 @@
/// <returns></returns>
[Route(template: "MesOrderWxStepSearch")]
[HttpGet]
- public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string orderno = null,string saorderno=null, string partcode = null, string partname = null, string partspec = 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 = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, orderno, saorderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -559,6 +580,8 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
+ /// <param name="saorderno">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -569,13 +592,13 @@
/// <returns></returns>
[Route(template: "MesOrderNgStepSearch")]
[HttpGet]
- public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string orderno = null,string saorderno=null, string partcode = null, string partname = null, string partspec = 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 = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, orderno, saorderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -730,9 +753,12 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
+ /// <param name="saorderno">閿�鍞崟鍙�</param>
/// <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 +768,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 orderno=null,string saorderno=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 +779,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, orderno,saorderno, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -796,6 +822,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[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
@@ -805,6 +848,8 @@
/// <param name="reviewstatus">瀹℃牳鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
+ /// <param name="saorderno">閿�鍞崟鍙�</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -818,7 +863,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null,string orderno=null,string saorderno=null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -829,7 +874,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, orderno,saorderno, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -890,6 +935,7 @@
/// <summary>
/// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
/// </summary>
+ /// <param name="issouceorder">鏄惁婧愬崟(Y/N)</param>
/// <param name="deptno">閮ㄩ棬缂栫爜(T8浣跨敤)</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
@@ -901,9 +947,9 @@
/// <returns></returns>
[Route(template: "ProductInHouseOrderSearch")]
[HttpGet]
- public JsonResult ProductInHouseOrderSearch(string deptno, string saleordercode, string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null)
+ public JsonResult ProductInHouseOrderSearch(string issouceorder, string deptno, string saleordercode, string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null)
{
- mes = WorkOrderBLL.ProductInHouseOrderSearch(deptno, saleordercode, wkshopcode, erpordercode, mesordercode, partcode, partname, partspec);
+ mes = WorkOrderBLL.ProductInHouseOrderSearch(issouceorder,deptno, saleordercode, wkshopcode, erpordercode, mesordercode, partcode, partname, partspec);
return Json(mes);
}
#endregion
--
Gitblit v1.9.3