From 25ba0980e71c958a661acbd149763079059b3922 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 11 十一月 2024 13:38:54 +0800
Subject: [PATCH] 出站单增加字段 HMachineWorkTimes 设备工时
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 145 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 143 insertions(+), 2 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 b2942ee..89ab01a 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"
@@ -1475,7 +1475,8 @@
}
#endregion
- #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
+ //SN鐮佽拷婧�
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
[HttpGet]
public object Get_QC_FiveMenOneRingList(string SN, string user)
@@ -1529,7 +1530,7 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("select * from h_v_QC_FiveMenOneRingList_HB where 1=1 '"+sWhere+"' order by 鏃ユ湡 desc", "h_v_QC_FiveMenOneRingList_HB");
+ ds = oCN.RunProcReturn("select * from h_v_QC_FiveMenOneRingList_HB where 1=1 "+sWhere+" order by 鏃ユ湡 desc", "h_v_QC_FiveMenOneRingList_HB");
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
@@ -1553,6 +1554,34 @@
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds;
objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //闀洉鐮侀〉绛�-娴佽浆鍗″彿鏌ヨ杩斿洖娴佽浆鍗d
+ [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HProcHBillNoID")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList_HProcHBillNoID(string HProcHBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select top 1 hmainid from h_v_Sc_ProcessExchangeBillList_Query where 鍗曟嵁鍙�= '"+ HProcHBillNo +"'", "h_v_Sc_ProcessExchangeBillList_Query");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = null;
return objJsonResult;
}
catch (Exception e)
@@ -1798,5 +1827,117 @@
}
#endregion
+ #region 璐ㄩ噺妯″潡 鐢熶骇璐ㄩ噺鏃ユ姤
+ [Route("QC_CustomerAppealReport/GetQC_QualityDailyReprot")]
+ [HttpGet]
+ public object GetQC_QualityDailyReprot(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (sWhere == null || sWhere == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HBatchNo = dic["HBatchNo"].ToString();//鎵规鍙�
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+ string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О
+ string HReceiveMan = dic["HReceiveMan"].ToString();//鎿嶄綔鍛�
+ string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+
+ ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "'", "h_p_QC_QualityDailyReprot");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺妯″潡 姣忔棩鏃ユ姤
+ [Route("QC_CustomerAppealReport/GetQC_QualityDailyReprot_Sum")]
+ [HttpGet]
+ public object GetQC_QualityDailyReprot_Sum(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (sWhere == null || sWhere == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+ string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О
+
+ ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot_Sum '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "'", "h_p_QC_QualityDailyReprot_Sum");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1