From 53868f5fa77292e861cf63d1536b1e2697019a1f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 15:35:21 +0800
Subject: [PATCH] 末件检验单优化
---
WebAPI/Controllers/华远datamapping/Gy_BarCodeReportController.cs | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_BarCodeReportController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_BarCodeReportController.cs"
index f8056e5..48d9b01 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_BarCodeReportController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_BarCodeReportController.cs"
@@ -24,6 +24,8 @@
DataSet ds;
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
// GET: Gy_BarCodeReport
+ #region //鑾峰彇绔欏彴鍙�
+
[Route("Gy_BarCodeReportController/Get_Stations")]
[HttpGet]
public object Get_Stations()
@@ -48,6 +50,10 @@
return objJsonResult;
}
}
+ #endregion
+
+ #region 鑾峰彇鏂欏彿
+
[Route("Gy_BarCodeReportController/GetMaterialNos")]
[HttpGet]
public object GetMaterialNos()
@@ -72,29 +78,130 @@
return objJsonResult;
}
}
+ #endregion
- #region 鍒楄〃鏌ヨ
- [Route("Gy_BarCodeReportController/list")]
+
+ #region 琛ㄦ牸鏌ヨ
+ [Route("Gy_BarCodeReportController/GetBadReason_proc")]
[HttpGet]
- public object list(string sWhere, string user)
+ public object GetBadReason_proc(string sWhere, string user)
{
try
{
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string Station = dic["Station"].ToString();//绔欏彴
+ string MaterialNo = dic["MaterialNo"].ToString();//鏂欏彿
+ string LotNo = dic["LotNo"].ToString();//鎵规鍙�
+
List<object> columnNameList = new List<object>();
- //鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldUpperBill_Query", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
+ ds = oCN.RunProcReturn("exec h_p_QC_BarCodeReasonTable '" + HBeginDate + "','" + HEndDate + "','" + Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeReasonTable");
+
+ //if (ds == null || ds.Tables.Count == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //娣诲姞鍒楀悕1
+ 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;
+ 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("Gy_BarCodeReportController/GetBadReasonTotal_proc")]
+ [HttpGet]
+ public object GetBadReasonTotal_proc(string sWhere, string user)
+ {
+ try
+ {
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string Station = dic["Station"].ToString();//绔欏彴
+ string MaterialNo = dic["MaterialNo"].ToString();//鏂欏彿
+ string LotNo = dic["LotNo"].ToString();//鎵规鍙�
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_BarCodeReasonTotalReport '" + HBeginDate + "','" + HEndDate + "','" +Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
}
- //string sql1 = "s"+"select * from h_v_Gy_BarCodeReport";
- //string sql = sql1 + sWhere + " ";
- //ds = oCN.RunProcReturn(sql, "h_v_Gy_BarCodeReport");
- ds =oCN.RunProcReturn("select a.HCheckProc 妫�楠屽伐搴�,b.HLayOutName 鏂欏彿,a.HBarCode PNL鏉＄爜缂栧彿,HPCSNo PCS鍙�,a.HPageIndex 姝ｅ弽闈�,a.HBadReason 涓嶈壇鍘熷洜 from QC_CheckNote_PNL_Temp a INNER JOIN Gy_PNLInfo b on a.HMakeDate=b.HMakeDate where 1=1 " + sWhere , "h_v_Gy_BarCodeReport");
+
+ 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 pie鍥�
+ [Route("Gy_BarCodeReportController/GetBadReason_pie")]
+ [HttpGet]
+ public object GetBadReason_pie(string sWhere, string user)
+ {
+ try
+ {
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string Station = dic["Station"].ToString();//绔欏彴
+ string MaterialNo = dic["MaterialNo"].ToString();//鏂欏彿
+ string LotNo = dic["LotNo"].ToString();//鎵规鍙�
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_BarCodeBadReasonReport_pie '" + HBeginDate + "','" + HEndDate + "','" + Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport_pie");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1