From 1c3a5fd0f49506c1ef68a4dbf3a44ef2ef3600d8 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 21 十一月 2024 16:43:09 +0800
Subject: [PATCH] 优化热处理/干燥机从 全程报表跳转获取开始结束时间,增加PDA开工单保存,增加设备工艺参数趋势图 增加根据物料+设备+工序 获取 产品工艺参数清单 工艺参数 增加 根据流转卡+工序 获取设备
---
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 544ec93..b399ad4 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -166,11 +166,20 @@
List<object> columnNameList = new List<object>();
if (num=="1")
{
- ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О from Sc_ICMOBillStatus_Tmp a left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID where HSourceInterID='" + linterid + "' and HProcID='85'", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О,c.HProjectNum 椤圭洰缂栧彿,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 from Sc_ICMOBillStatus_Tmp a " +
+ "left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID " +
+ "left join Sc_ProcessExchangeBillMain c on a.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and a.HSourceEntryID=d.HEntryID " +
+ "where a.HSourceInterID='" + linterid + "' and a.HProcID='85'", "Gy_EquipFileBillMain");
}
else if (num=="2")
{
- ds = oCN.RunProcReturn("SELECT ef.HEquipFileNumber AS 璁惧缂栫爜,ef.HName AS 璁惧鍚嶇О FROM Gy_EquipFileBillMain ef JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID where HSourceInterID='" + linterid + "' and HProcID='186')", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("SELECT ef1.HEquipFileNumber AS 璁惧缂栫爜,ef1.HName AS 璁惧鍚嶇О,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 FROM Gy_EquipFileBillMain ef " +
+ "JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID " +
+ "left join Gy_EquipFileBillMain ef1 on ef1.HMainSourceID=ef.HInterID " +
+ "left join Sc_ProcessExchangeBillMain c on tmp.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and tmp.HSourceEntryID=d.HEntryID " +
+ "where tmp.HSourceInterID='" + linterid + "' and tmp.HProcID='186'", "Gy_EquipFileBillMain");
}
//娣诲姞鍒楀悕
--
Gitblit v1.9.1