From cfd2e350f5d92ba5b9d0cdf0f3e455497210c9ce Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 八月 2024 16:59:01 +0800
Subject: [PATCH] 11
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 66abec4..fa0386c 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1170,7 +1170,7 @@
string sql = string.Format(@"select * from h_v_Sc_ProcessExchangeBillQuerySub");
- ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 鍑虹珯鍏宠仈鏁伴噺=0 and cast(娴佹按鍙� as int)>" + ds1 .Tables[0].Rows[0][0].ToString(), "h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 鍑虹珯鍏宠仈鏁伴噺=0 and cast(娴佹按鍙� as int)>" + ds1 .Tables[0].Rows[0][0].ToString()+ " order by cast(娴佹按鍙� as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
if (float.Parse(ds.Tables[0].Rows[0]["杩涚珯鍏宠仈鏁伴噺"].ToString()) > 0)
{
@@ -1246,9 +1246,9 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+ int num = oItem.HBillNo.Split('-').Length;
oBill.omodel.HMaker = msg5; //鍒跺崟浜�
- oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
+ oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[num - 1]);
oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oBill.omodel.HDate = oItem.HDate;// 鏃ユ湡
@@ -1256,6 +1256,7 @@
oBill.omodel.HPlanEndDate = oItem.HPlanEndDate;// 璁″垝瀹屽伐鏃ユ湡
oBill.omodel.HQty = oItem.HQty;// 鏁伴噺
oBill.omodel.HBillNo = oItem.HBillNo;// 鍗曟嵁鍙�
+ oBill.omodel.HProjectNum = oItem.HProjectNum;// 椤圭洰鍙�
}
//琛ㄤ綋鏁版嵁
@@ -1311,7 +1312,6 @@
j++;
}
}
-
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -1911,7 +1911,6 @@
}
#endregion
-
#region 宸ュ簭娴佽浆鍗″垪琛�
/// <summary>
/// 鑾峰彇宸ュ簭娴佽浆鍗″垪琛ㄤ俊鎭�
@@ -1965,5 +1964,71 @@
}
#endregion
+ #region[鎵归噺鎷嗗垎鐢熸垚娴佽浆鍗
+ /// <summary>
+ /// 杩斿洖鎷嗗垎鍚庣殑鐢熶骇璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="hmainid">鐢熶骇浠诲姟鍗曚富瀛怚D</param>
+ /// <returns>object</returns>
+ [Route("Sc_ProcessExchangeBill/BatchSpilt")]
+ [HttpGet]
+ public object BatchSpilt(string HInterID, string user)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "婧愬崟涓诲瓙id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string[] HInterEntryIDArr = HInterID.Split(',');
+
+ string[] HData;
+
+ for (int i = 0; i < HInterEntryIDArr.Length; i++)
+ {
+ string[] HIDs = HInterEntryIDArr[i].Split('@');
+
+ string sql = "exec h_p_Sc_ProcessExchange_BatchSplit '" + HIDs[0] + "','" + HIDs[1] + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchange_BatchSplit");
+
+
+ }
+
+
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎷嗗垎鐢熶骇璁㈠崟鏃犳暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1