From 57881d97e8b71ef3589c17d3eddf34453427ca09 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期六, 09 十月 2021 11:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Pay_SingleBalBillController.cs | 68 +++++++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 3 +
2 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/Pay_SingleBalBillController.cs b/WebAPI/Controllers/Pay_SingleBalBillController.cs
index a51a0aa..206cecf 100644
--- a/WebAPI/Controllers/Pay_SingleBalBillController.cs
+++ b/WebAPI/Controllers/Pay_SingleBalBillController.cs
@@ -16,8 +16,10 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
+ //DataSet ds;
/// <summary>
@@ -67,7 +69,71 @@
return objJsonResult;
}
}
+ #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Pay_SingleBalBill/Pay_SingleBalBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Pay_SingleBalBillListCheckDetail(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_Pay_SingleBalBillList where hmainid= " + HID + " ", "h_v_Pay_SingleBalBillList");
+ 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("Pay_SingleBalBill/Pay_SingleBalBillListProjectDetai")]
+ [HttpGet]
+ public object Pay_SingleBalBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID 鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О, HDeptID 閮ㄩ棬浠ｇ爜,閮ㄩ棬,HGroupID 鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,
+ 琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID 宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О,
+ HEmpID 鑱屽憳浠ｇ爜,鑱屽憳,宸ユ椂,鏁伴噺,宸ヤ环,閲戦
+ FROM h_v_Pay_SingleBalBillList"), "h_v_Pay_SingleBalBillList");
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+
+ //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
+ string sql1 = string.Format(@"SELECT HMaterID 鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О, HDeptID 閮ㄩ棬浠ｇ爜,閮ㄩ棬,HGroupID 鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,
+ 琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID 宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О,
+ HEmpID 鑱屽憳浠ｇ爜,鑱屽憳,宸ユ椂,鏁伴噺,宸ヤ环,閲戦
+ FROM h_v_Pay_SingleBalBillList where 1 = 1 ");
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
+
+ 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>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6e9028a..e8b60da 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -332,6 +332,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
+ <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
@@ -433,6 +434,8 @@
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Pay_SingleBalBill.cs" />
+ <Compile Include="Models\Pay_SingleBalBillSub.cs" />
<Compile Include="Models\Xt_ORGANIZATIONS.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
--
Gitblit v1.9.1