From 5e5684c19b0a2eb729d757d3c2495029b4121ecc Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期二, 26 一月 2021 16:53:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Controllers/LMESController.cs | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 0b1a8f1..7bb1e83 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1030,6 +1030,80 @@
return GetObjectJson(ds);
}
- //
+ /// <summary>
+ /// 杩斿洖澧欏挃宸ヨ祫缁熻鎶ヨ〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Qk_OutProcessList_Json")]
+ [HttpGet]
+ public object MES_Qk_OutProcessList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from (select min(a.HDate) 璧峰鏃堕棿, max(a.HDate) 鎴嚦鏃堕棿, b.HName 宸ュ簭鍚嶇О, c.HName 鐝粍鍚嶇О, d.HName 姹囨姤浜�, sum(a.HQty) 鍚堣姹囨姤鏁伴噺, sum(b.HFixPrice * a.HQty) 鍚堣宸ヨ祫 from Sc_StationOutBillMain a left join Gy_Process b on a.HProcID = b.HItemID Left join Gy_Group c on a.HGroupID = c.HItemID left join Gy_Employee d on a.HEmpID = d.HItemID where 1=1 group by b.HName,c.HName,d.HName) t where 1=1 " + sWhere, "Sc_StationOutBillMain");
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ //鍗曡鍒犻櫎杩涚珯鎺ユ敹鍗曞垪琛�
+ [Route("LEMS/StationInBillListDelete_Json")]
+ [HttpGet]
+ public object StationInBillListDelete_Json(long sHInterID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ oCn.RunProc("Delete from Sc_StationInBillMain where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "200";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "000";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+
+ }
+
+ //鍗曡鍒犻櫎鍑虹珯姹囨姤鍗曞垪琛�
+ [Route("LEMS/StationOutBillListDelete_Json")]
+ [HttpGet]
+ public object StationOutBillListDelete_Json(long sHInterID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ oCn.RunProc("Delete from Sc_StationOutBillMain where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "200";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "000";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+
+ }
+
+ //
}
}
\ No newline at end of file
--
Gitblit v1.9.1