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/DLL/DAL/DeviceManagerDAL.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
index 5740f43..291efe4 100644
--- a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
@@ -736,6 +736,61 @@
}
#endregion
+ #region[璁惧娓呭崟鏌ョ湅灞ュ巻]
+ public static ToMessage DeviceResumeSearch(string eqpcode, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ dynamicParams.Add("@eqpcode", eqpcode);
+ if (opendate != "" && opendate != null)
+ {
+ search += "and AA.operdate between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select top 100 percent AA.*,U.username as operusername from (
+ select '鐐规' as opertype,chk_user as operuser,chk_date as operdate,chk_result as operresult
+ from TEqpchk_Proc_Main where eqp_code=@eqpcode
+ union all
+ select '淇濆吇' as opertype,maint_user as operuser,maint_date as operdate,maint_result as operresult
+ from TEqpmaint_Proc_Main where eqp_code=@eqpcode
+ union all
+ select '寰呯淮淇�' as opertype,request_person as operuser,request_date as operdate,'缁翠慨鐢宠' as operresult
+ from TEqp_RepairRequest where eqp_code=@eqpcode
+ union all
+ select '宸茬淮淇�' as opertype,repair_person as operuser,repair_date as operdate,'缁翠慨瀹屾垚' as operresult
+ from TEqp_RepairRequest A
+ inner join TEqp_Repair B on A.docu_code=B.source_wo
+ where A.eqp_code=@eqpcode and B.repair_person<>''
+ union all
+ select '宸查獙璇�' as opertype,verify_person as operuser,verify_date as operdate,B.verify_result as operresult
+ from TEqp_RepairRequest A
+ inner join TEqp_Repair B on A.docu_code=B.source_wo
+ where A.eqp_code=@eqpcode and B.verify_person<>''
+ ) as AA
+ left join TUser U on AA.operuser=U.usercode
+ where 1=1 " + search + " order by AA.operdate desc ";
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
#region[璁惧鐐规椤瑰垪琛ㄦ煡璇
public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
--
Gitblit v1.9.3