From e4c1d8a8c75368c091db094d616ddc7bafd52df8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 08 十月 2024 10:50:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_BillTypeController.cs | 98 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
index 00d594e..b9eeacb 100644
--- a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
+++ b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
@@ -13,11 +13,9 @@
public class Xt_BillTypeController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
/// 杩斿洖鍗曟嵁绫诲瀷鍒楄〃
@@ -77,7 +75,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 鍗曟嵁绫诲瀷鍒楄〃淇敼鏂规硶
@@ -146,7 +143,6 @@
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
-
try
{
var _value = oMain["oMain"].ToString();
@@ -169,8 +165,6 @@
string HViewName = list[0].HViewName;
string HRightName = list[0].HRightName;
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -204,7 +198,6 @@
}
}
-
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -220,11 +213,7 @@
string msg1 = _value.ToString();
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
-
-
-
List<BillType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BillType>>(msg1);
-
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -234,13 +223,9 @@
string HViewName = list[0].HViewName;
string HRightName = list[0].HRightName;
-
-
-
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+
//涓昏〃
oCN.RunProc("Insert Into Xt_BillType " +
"(HNumber,HName,HTemplate,HHeadTable" +
@@ -268,7 +253,86 @@
}
}
+
+ /// <summary>
+ /// 鍗曟嵁鍒犻櫎
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBill/delete_Test1")]
+ [HttpGet]
+ public object deleteYS_ReceiveBill(long HItemID)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("delete from Xt_BillType Where HItemID =" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
- //
+ #region 鍗曟嵁绫诲瀷 閲戣澏鍚屾
+ [Route("Xt_BillType/SaveXt_BillTypeListApi")]
+ [HttpPost]
+ public object SaveXt_BillTypeListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ LogService.Write("鍗曟嵁绫诲瀷:" + _value);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsXt_BillType_Model> lsmain = new List<Model.ClsXt_BillType_Model>();
+ lsmain = oListModels.getObjectByJson_Xt_BillType(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Xt_BillType where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ //sql = "set identity_insert Xt_BillType on";
+ //oCN.RunProc(sql);
+
+ LogService.Write("鍗曟嵁绫诲瀷:" + $@"insert into Xt_BillType(HBilltypeID,HNumber,HName,HTemplate,HHeadTable,HEntryTable,HViewName,HRightName)
+ values('{lsmain[0].HBilltypeID}','{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HTemplate}','{lsmain[0].HHeadTable}','{lsmain[0].HEntryTable}','{lsmain[0].HViewName}','{lsmain[0].HRightName}' )");
+
+ oCN.RunProc($@"insert into Xt_BillType(HBilltypeID,HNumber,HName,HTemplate,HHeadTable,HEntryTable,HViewName,HRightName)
+ values('{lsmain[0].HBilltypeID}','{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HTemplate}','{lsmain[0].HHeadTable}','{lsmain[0].HEntryTable}','{lsmain[0].HViewName}','{lsmain[0].HRightName}' )", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠g爜
+ sql = "set identity_insert Xt_BillType off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1