From 10be6891dceb6e622ee980e9687c7ffa2544e564 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 16 九月 2021 17:45:03 +0800
Subject: [PATCH] 完善器具采购单
---
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 55338e2..80754f8 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -11,19 +11,16 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
- #region 妯℃不鍏峰叾浠栧嚭搴撳崟
+ #region 妯℃不鍏峰櫒鍏峰垎甯冨紡璋冨叆鍗曞垪琛�
- /// <summary>
- /// 妯℃不鍏峰叾浠栧嚭搴撳崟鍒楄〃 list鍒楄〃鏁版嵁鍔犺浇
- /// </summary>
- /// <returns></returns>
- [Route("Sc_MouldOtherOutBill/GetMouldOtherOutBillList")]
+ [Route("Sc_MouldProdMoveBillList/GetMouldOtherOutBillList")]
[HttpGet]
public object GetMouldOtherOutBillList(string sWhere)
{
try
{
- ds = Sc_MouldOtherOutBillList_s(sWhere);
+
+ ds = Sc_MouldProdMoveBillList(sWhere);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -39,6 +36,51 @@
return objJsonResult;
}
}
+
+ public static DataSet Sc_MouldProdMoveBillList(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherOutBillList ", "h_v_Sc_MouldOtherOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
+ }
+
+ }
+ #endregion
+
+ //#region 妯℃不鍏峰叾浠栧嚭搴撳崟
+
+ ///// <summary>
+ ///// 妯℃不鍏峰叾浠栧嚭搴撳崟鍒楄〃 list鍒楄〃鏁版嵁鍔犺浇
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("Sc_MouldOtherOutBill/GetMouldOtherOutBillList")]
+ //[HttpGet]
+ //public object GetMouldOtherOutBillList(string sWhere)
+ //{
+ // try
+ // {
+ // ds = Sc_MouldOtherOutBillList_s(sWhere);
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // catch (Exception ex)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
#region sql璇彞
@@ -285,8 +327,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn(@"select 妯″叿浠ｇ爜 HMaterID,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec ,鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife,鍓╀綑瀵垮懡 HLeaveLife,绱Н浣跨敤瀵垮懡 HUseLife,瀹炲彂鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,妯″叿浠撳簱浠ｇ爜 HWHID,鍙戣揣浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
-from h_v_Sc_MouldOtherOutBillList", "h_v_Sc_MouldOtherOutBillList_Edit");
+ ds = oCN.RunProcReturn(@"select HMaterID 妯″叿浠ｇ爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 妯″叿浠撳簱浠ｇ爜,琛ㄥご澶囨敞from h_v_Sc_MouldOtherOutBillList", "h_v_Sc_MouldOtherOutBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -294,8 +335,7 @@
}
else
{
- string sql1 = @"select 妯″叿浠ｇ爜 HMaterID,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec ,鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife,鍓╀綑瀵垮懡 HLeaveLife,绱Н浣跨敤瀵垮懡 HUseLife,瀹炲彂鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,妯″叿浠撳簱浠ｇ爜 HWHID,鍙戣揣浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
-from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
+ string sql1 = @"select HMaterID 妯″叿浠ｇ爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 妯″叿浠撳簱浠ｇ爜,琛ㄥご澶囨敞from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
objJsonResult.code = "0";
@@ -319,7 +359,6 @@
- #endregion
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1