From 410623b6bef2fded32597584a2b8ae35224d6f27 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期日, 04 一月 2026 17:08:21 +0800
Subject: [PATCH] 1.生产报工自制、外协、不良 增加：销售单号 2.报工调整、报工审核 增加：销售单号 3.工序质检方案修改注释掉判断条件 4.设备清单增加 设备履历接口：DeviceManager/DeviceResumeSearch
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index c5513d9..d994ef5 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -506,6 +506,7 @@
/// <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>
@@ -516,13 +517,13 @@
/// <returns></returns>
[Route(template: "MesOrderStepSearch")]
[HttpGet]
- public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null,string orderno = 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, orderno, 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
@@ -534,6 +535,7 @@
/// <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>
@@ -544,13 +546,13 @@
/// <returns></returns>
[Route(template: "MesOrderWxStepSearch")]
[HttpGet]
- public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string orderno = 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, orderno, 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
@@ -562,6 +564,7 @@
/// <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>
@@ -572,13 +575,13 @@
/// <returns></returns>
[Route(template: "MesOrderNgStepSearch")]
[HttpGet]
- public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string orderno = 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, orderno, 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
@@ -734,6 +737,7 @@
/// <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>
@@ -747,7 +751,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null,string orderno=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)
+ 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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -758,7 +762,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, orderno, partnumber, partname, partspec, stepcode, 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
@@ -828,6 +832,7 @@
/// <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>
@@ -841,7 +846,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null,string orderno=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -852,7 +857,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, orderno, 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
--
Gitblit v1.9.3