From 02ed844296290416cbaaf2801fdc3a0858f5964f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 05 六月 2024 19:46:08 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 888879e..4ffa124 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11999,8 +11999,8 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);
- ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
- ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub_Item");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//閰嶄欢
list.Add(ds1.Tables[0]);
list.Add(ds2.Tables[0]);
objJsonResult.code = "0";
@@ -12134,19 +12134,22 @@
List<object> list = new List<object>();
DataSet ds2;
DataSet ds1;
- string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
- left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
- left join Gy_Employee e on e.HItemID=t.HManagerID
- where a.HInterID=" + EquipProjectID);
- string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
- left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
- left join h_v_IF_Material m on b.HMaterID=m.HItemID
- left join h_v_IF_Unit u on b.HUnitID=u.HItemID
- where a.HInterID=" + EquipProjectID);
+ // string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ // from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ // left join Gy_Employee e on e.HItemID=t.HManagerID
+ // where a.HInterID=" + EquipProjectID);
+ // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ // left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ // where a.HInterID=" + EquipProjectID);
- ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
- ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
+ string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);
+
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//閰嶄欢
list.Add(ds1.Tables[0]);
list.Add(ds2.Tables[0]);
objJsonResult.code = "0";
--
Gitblit v1.9.1