From b62e0517155d184a5d14b6113490b7140d45a738 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 27 六月 2023 14:24:56 +0800
Subject: [PATCH] 基础资料(工序、生产资源、生产班组、不良原因、故障原因)：添加审核、反审核、禁用、反禁用按钮
---
WebAPI/Controllers/MateOutController.cs | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 306 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 25f29e2..6c03f4d 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -553,7 +553,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚棰嗘枡鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚棰嗘枡鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -561,7 +562,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -618,7 +620,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
objJsonResult.data = null;
return objJsonResult;
}
@@ -626,7 +629,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1317,6 +1321,303 @@
return objJsonResult;
}
}
-
+
+
+
+ #region 鐧藉澂鍙戝竷姹囨�绘姤琛�
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ //private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //DataSet ds;
+
+ public class MaterOutSumReport
+ {
+ public DateTime HBeginDate;
+ public DateTime HEndDate;
+ public string HMaterNumber;
+ public string HBillNo;
+ public string HProductName;
+ public string HProductModel;
+ public string RandomSearch;
+ }
+
+ #region 鐧藉澂鍙戝竷姹囨�绘姤琛�
+ [Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
+ [HttpGet]
+ public object MaterOutSumReport_Cloth(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
+
+ string sql = "" +
+ "( (鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (鍗曟嵁鍙�=''" + com.HBillNo + "'' or ''"+ com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
+ "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth_New '{sql}'" , "h_p_Kf_MaterOutSumReport_Cloth_New");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ //int headLen = col.ColumnName.ToString().Length; //鍒楀悕鐨勯暱搴�
+ //int colLen = 0;
+ //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
+ //{
+ // string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
+ // if(colLenStr != "")
+ // {
+ // colLen = int.Parse(colLenStr); //鍒椾腑鏈�闀挎暟鎹殑闀垮害
+ // }
+
+ //}
+ //colLen = (headLen >= colLen) ? headLen : colLen;
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃
+ [Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
+ [HttpGet]
+ public object MaterOutEntryReport_Cloth(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
+
+ string sql = "" +
+ "( (鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (浠诲姟鍗�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
+ "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutEntryReport_Cloth_New '{sql}'", "h_p_Kf_MaterOutEntryReport_Cloth_New");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ //int headLen = col.ColumnName.ToString().Length; //鍒楀悕鐨勯暱搴�
+ //int colLen = 0;
+ //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
+ //{
+ // string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
+ // if (colLenStr != "")
+ // {
+ // colLen = int.Parse(colLenStr); //鍒椾腑鏈�闀挎暟鎹殑闀垮害
+ // }
+
+ //}
+ //colLen = (headLen >= colLen) ? headLen : colLen;
+ 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.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+ #region 鏌撳巶姹囨�绘姤琛�
+
+ #region 鏌撳巶姹囨�绘姤琛�
+ [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")]
+ [HttpGet]
+ public object ProdProcessSumReport_DyeColor(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
+
+ string sql = "" +
+ "( (鐢熶骇璁㈠崟鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
+ "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鏌撳巶鏄庣粏鎶ヨ〃
+ [Route("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")]
+ [HttpGet]
+ public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
+
+ string sql = "" +
+ "( (鐢熶骇璁㈠崟鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
+ "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " +
+ "and (娴佽浆鍗″彿=''" + sProcessNo + "'' or ''"+ sProcessNo + "''= '''')" + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessEntryReport_DyeColor '{sql}'", "h_p_Kf_ProdProcessEntryReport_DyeColor");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ #region 鏌撳巶浜ч噺鎶ヨ〃
+ [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
+ [HttpGet]
+ public object ProdProcessSumReport_DyeColor_third(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
+
+ string sql = "" +
+ "( (鏌撳巶鍑虹珯鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
+ "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor_third '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor_third");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ #endregion
+
+
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1