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/DeviceManagerController.cs | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/VueWebCoreApi/Controllers/DeviceManagerController.cs b/VueWebCoreApi/Controllers/DeviceManagerController.cs
index f6a24e8..b23cc77 100644
--- a/VueWebCoreApi/Controllers/DeviceManagerController.cs
+++ b/VueWebCoreApi/Controllers/DeviceManagerController.cs
@@ -158,6 +158,35 @@
}
#endregion
+ #region[璁惧娓呭崟鏌ョ湅灞ュ巻]
+ /// <summary>
+ /// 璁惧娓呭崟鏌ョ湅灞ュ巻
+ /// </summary>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="createdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceResumeSearch")]
+ [HttpGet]
+ public JsonResult DeviceResumeSearch(string eqpcode, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (createdate != "" && createdate != null)
+ {
+ opendate = createdate.Split('~')[0].ToString();
+ closedate = createdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceResumeSearch(eqpcode, opendate, closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
#region[璁惧鐐规椤瑰垪琛ㄦ煡璇
--
Gitblit v1.9.3