From fd2d833bf010d0be1bb308d9c431eee1dfd931ff Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 十二月 2024 16:46:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 7bc9f99..35b30b8 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -1606,13 +1606,13 @@
//鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹�
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
[HttpGet]
- public object Get_QC_FiveMenOneRingList_Right(string linterid,string SNs, string user)
+ public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
@@ -1811,7 +1811,7 @@
ds = oCN.RunProcReturn("select a.HBillNo 宸ュ簭娴佽浆鍗″彿,e.HInterID 璁惧id,e.HEquipFileNumber 璁惧浠ｇ爜,e.HName 璁惧鍚嶇О,d.HName 鐢熶骇璧勬簮,a.HMaterID 鐗╂枡id,c.HName 鐗╂枡鍚嶇О,b.HProcID 宸ュ簭id,f.HName 宸ュ簭鍚嶇О,b.HRelBeginDate 寮�濮嬫椂闂�,b.HRelEndDate 缁撴潫鏃堕棿 " +
"from Sc_ProcessExchangeBillMain a inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
"left join Gy_Material c on a.HMaterID = c.HItemID left join Gy_Source d on b.HSourceID = d.HItemID " +
- "left join Gy_EquipFileBillMain e on b.HSourceID = e.HSourceID left join Gy_Process f on b.HProcID = f.HItemID where a.HInterID='"+linterid+ "' and b.HProcID='"+HProcID+"'", "SB_EquipICMOTechParamBillMain");
+ "left join Gy_EquipFileBillMain e on b.HSourceID = e.HSourceID and b.HSourceID<>0 left join Gy_Process f on b.HProcID = f.HItemID where a.HInterID='" + linterid+ "' and b.HProcID='"+HProcID+"'", "SB_EquipICMOTechParamBillMain");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -1842,15 +1842,24 @@
[Route("QC_CustomerAppealReport/Get_TechParamList")]
[HttpGet]
- public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string user)
+ public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string HTeachName, string user)
{
try
{
List<object> columnNameList = new List<object>();
-
- ds = oCN.RunProcReturn("select c.HName 宸ヨ壓鍙傛暟,b.HDataForm 閲囬泦鏉ユ簮 from Gy_MaterialTechParamBillMain a " +
+ if (HTeachName=="")
+ {
+ ds = oCN.RunProcReturn("select c.HName 宸ヨ壓鍙傛暟,b.HDataForm 閲囬泦鏉ユ簮 from Gy_MaterialTechParamBillMain a " +
"inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
- "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='"+ HProID + "' and a.HEquipID='"+ HEquId + "' and b.HDataForm='璁惧閲囬泦' ", "SB_EquipICMOTechParamBillMain");
+ "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "'", "SB_EquipICMOTechParamBillMain");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select c.HName 宸ヨ壓鍙傛暟,b.HDataForm 閲囬泦鏉ユ簮 from Gy_MaterialTechParamBillMain a " +
+ "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
+ "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "' and c.HName ='" + HTeachName + "'", "SB_EquipICMOTechParamBillMain");
+ }
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
--
Gitblit v1.9.1