From af56ce9aaaebf2ea7b03c7096388ec8abf34d92c Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 03 十二月 2021 17:21:50 +0800
Subject: [PATCH] 出入库单保存后，更新器具档案 状态字段
---
WebAPI/Controllers/ReportFromController.cs | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 174 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/ReportFromController.cs b/WebAPI/Controllers/ReportFromController.cs
index 7a5c83b..446a30a 100644
--- a/WebAPI/Controllers/ReportFromController.cs
+++ b/WebAPI/Controllers/ReportFromController.cs
@@ -141,7 +141,7 @@
int pageSize = limit;
- ds = oCN.RunProcReturn("exec h_p_Mes_ReportMouldStock '" + HDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "',"+pageSize+","+pageNum+"", "h_p_Save_SubBarcodeToTmp");
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMouldStock '" + HDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "',"+pageSize+","+pageNum+"", "h_p_Mes_ReportMouldStock");
string aa = ds.Tables[0].Columns[0].ToString();
foreach (DataColumn col in ds.Tables[4].Columns)
@@ -184,7 +184,7 @@
}
#endregion
- #region [鍣ㄥ叿鍗虫椂搴撳瓨鏄庣粏鎶ヨ〃鍒楄〃]
+ #region [鍣ㄥ叿鍗虫椂搴撳瓨姹囨�绘姤琛ㄥ垪琛╙
[Route("Sc_MESReportFrom/ReportMouldStockBillSumList")]
[HttpGet]
public object ReportMouldStockBillSumList(int page, int limit, string HDate, string HNumber, string HSupName)
@@ -197,7 +197,7 @@
int pageSize = limit;
- ds = oCN.RunProcReturn("exec h_p_Mes_ReportMouldStockSum '" + HDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Save_SubBarcodeToTmp");
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMouldStockSum '" + HDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMouldStockSum");
string aa = ds.Tables[0].Columns[0].ToString();
foreach (DataColumn col in ds.Tables[4].Columns)
@@ -239,6 +239,177 @@
return objJsonResult;
}
#endregion
+
+
+ #region [鍣ㄥ叿搴撳瓨鍙拌处鏄庣粏鎶ヨ〃鍒楄〃]
+ [Route("Sc_MESReportFrom/ReportInventoryAccountBillList")]
+ [HttpGet]
+ public object ReportInventoryAccountBillList(int page, int limit, string HStartDate, string HEndDate,string HSupName)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+
+
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportInventoryAccount '" + HStartDate + "','" + HEndDate + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportInventoryAccount");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[1].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #region [鍣ㄥ叿鏀跺彂鏂欐槑缁嗘姤琛ㄥ垪琛╙
+ [Route("Sc_MESReportFrom/ReportMaterialReceiptBillList")]
+ [HttpGet]
+ public object ReportMaterialReceiptBillList(int page, int limit, string HStartDate,string HEndDate, string HNumber, string HBarCode, string HSupName)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+
+
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceipt '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceipt");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[1].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹紒";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [鍣ㄥ叿鏀跺彂鏂欐眹鎬绘姤琛ㄥ垪琛╙
+ [Route("Sc_MESReportFrom/ReportMaterialReceiptBillSumList")]
+ [HttpGet]
+ public object ReportMaterialReceiptBillSumList(int page, int limit, string HStartDate, string HEndDate, string HNumber, string HSupName)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+
+
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceiptSum '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceiptSum");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[1].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹紒";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1