From 78ff1efa3f21c9cb330338d00c378b79c9df2b7f Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 03 九月 2021 18:04:18 +0800
Subject: [PATCH] 进站单上道工序转序检验，出站单当前工序首件检验
---
WebAPI/Controllers/LMESController.cs | 90 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 0b1a8f1..1d9e72a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -14,6 +14,7 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
/// <summary>
/// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -221,17 +222,7 @@
DataSet ds;
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_ICMOBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
- }
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by hmainid desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
@@ -1030,6 +1021,81 @@
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