From bfa8577d2db5d4b2bd34a650c340c0b5b8125045 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 05 九月 2022 14:50:50 +0800
Subject: [PATCH] 工序流转卡（汇报）
---
WebAPI/Controllers/LMESController.cs | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 27bb091..b74aeeb 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -114,7 +114,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = "select * from h_v_Sc_ProcessExchangeBillQuerySub where hmainid = ";
string sql1 = sql + sWhere;
- ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(sql1+ " order by cast(宸ュ簭鍙� as int)", "h_v_Sc_ProcessExchangeBillQuerySub");
}
catch (Exception e)
{
@@ -125,6 +125,73 @@
return objJsonResult;
}
return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗★紙涓嬭揪锛夊垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+
+ [Route("LEMS/MES_Sc_ProcessExchangeIssueBillList_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessExchangeIssueBillList_Json(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 涓嬭揪
+ /// </summary>
+ /// <returns></returns>
+ [Route("LEMS/MES_Sc_ProcessExchangeIssue")]
+ [HttpGet]
+ public object MES_Sc_ProcessExchangeIssue(string HGroupID, string HSourceID, string HEntryId) {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn($"exec REALESE_Sc_ProcessExchangeIssue '{HGroupID}','{HSourceID}','{HEntryId}' ", "REALESE_Sc_ProcessExchangeIssue");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
/// <summary>
@@ -219,12 +286,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
}
else
{
- string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc";
+ string sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
+ string sql = sql1 + sWhere+ " order by hmainid desc,cast(宸ュ簭鍙� as int)";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
}
}
@@ -322,6 +389,49 @@
}
#endregion
+ #region 宸ヨ壓璺嚎鍩虹鍒楄〃
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Gy_RoutingBillList")]
+ [HttpGet]
+ public object Gy_RoutingBillList(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql1 = "select * from h_v_Gy_RoutingBillList_Base where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList_Base");
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ #endregion
+
#endregion
/// <summary>
@@ -346,7 +456,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by hmainid desc", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
--
Gitblit v1.9.1