From e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 05 十一月 2021 15:46:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
index 5925e55..7abb168 100644
--- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -22,7 +22,52 @@
DataSet ds1;
+ #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> QC_LastPieceCheckBillListCheckDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_QC_LastPieceCheckBillListDetail where hmainid= " + HID + " ", "h_v_QC_LastPieceCheckBillListDetail");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListProjectDetai")]
+ [HttpGet]
+ public object QC_LastPieceCheckBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT 鏃ユ湡,鍗曟嵁鍙�,澶囨敞,浜у搧鍐呯爜, 浜у搧鍚嶇О" +
+ ", 浜у搧鍨嬪彿, 妫�楠屽憳浠ｇ爜, 妫�楠屽憳鍚嶇О, 鍒跺崟浜�, 鍒跺崟鏃ユ湡" +
+ ", 瀹℃牳浜�, 瀹℃牳鏃ユ湡, 淇敼浜�, 淇敼鏃ユ湡, 鍏抽棴浜�, 鍏抽棴鏃ユ湡 FROM h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
@@ -196,7 +241,36 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ /// <summary>
+ ///鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_LastPieceCheckBill/DeltetLastPieceCheckBill")]
+ [HttpGet]
+ public object DeltetLastPieceCheckBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From QC_LastPieceCheckBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_LastPieceCheckBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
/// <summary>
/// 杩斿洖浜у搧鍏ュ簱妫�楠屽崟鍒楄〃
///鍙傛暟锛歴tring sql銆�
--
Gitblit v1.9.1