From fcc99f2648369ea6aa20e59f59653ac872bba091 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 19 十月 2025 13:01:03 +0800
Subject: [PATCH] 分支合并
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index f67fd55..253a980 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -247,6 +247,7 @@
}
#endregion
+ #region 鑾峰彇渚涘簲鍟嗙紪杈戞煡鐪� 瑙嗗浘
/// <summary>
/// 渚涘簲鍟嗗垪琛ㄤ慨鏀规寜閽柟娉�
///鍙傛暟锛歴tring sql銆�
@@ -281,8 +282,46 @@
return objJsonResult;
}
}
+ #endregion
+ #region 鑾峰彇渚涘簲鍟嗙紪杈戞煡鐪� 瑙嗗浘 鎵╁睍鍒跺崟淇℃伅
+ /// <summary>
+ /// 渚涘簲鍟嗗垪琛ㄤ慨鏀规寜閽柟娉�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Supplier/xg_ExpendBillMake")]
+ [HttpGet]
+ public object xg_ExpendBillMake(long HInterID)
+ {
+ try
+ {
+ string sql = string.Format(@"select * from h_v_Gy_SupplierEdit_ExpendBillMake where HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierEdit_ExpendBillMake");
+ DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '" + HInterID + "'", "Gy_Supplier_PayPlan");
+ DataSet cs1 = oCN.RunProcReturn("select * from Gy_Supplier_Link where HSupID = '" + HInterID + "'", "Gy_Supplier_Link");
+ List<Object> list = new List<object>();
+ list.Add(cs);
+ list.Add(cs1);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #region 鍗曟嵁淇濆瓨缁撳悎澶嶅埗鍔熻兘
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -321,7 +360,7 @@
string HAddress = list[0].HAddress;
string HLinkMan = list[0].HLinkMan;
string HLinkPhone = list[0].HLinkPhone;
- string HBankAccount = list[0].HMobilePhone;
+ string HBankAccount = list[0].HBankAccount;
string HFax = list[0].HFax;
string HPostalCode = list[0].HPostalCode;
string HEmail = list[0].HEmail;
@@ -345,6 +384,7 @@
string HMaterClass = list[0].HMaterClass;
long HPSStyleID = list[0].HPSStyleID;
long HSupTypeID = list[0].HSupTypeID;
+ string HMaker = list[0].HMaker;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -356,6 +396,17 @@
}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+ // 鑻ュ湪鏂板鍜屽鍒朵腑瀛樺湪鐩稿悓缁勭粐锛屽垯杩斿洖閿欒淇℃伅
+ DataSet ds_check = oCN.RunProcReturn(@"select * from Gy_Supplier where HNumber ='" + HNumber + "'" + "and HUSEORGID = '" + HUseOrgID + "'", "Gy_Supplier");
+ if (ds_check.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐩稿悓缁勭粐涓嬩笉鑳藉瓨鍦ㄧ浉鍚屼緵搴斿晢浠ｇ爜!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//涓昏〃
oCN.RunProc("Insert Into Gy_Supplier " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
@@ -363,13 +414,13 @@
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID,HSupTypeID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID,HSupTypeID,HMaker) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
"," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
- ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID+ "' ,'" + HSupTypeID +
+ ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID+ "' ,'" + HSupTypeID + "' ,'" + HMaker +
"') ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -420,6 +471,7 @@
return objJsonResult;
}
}
+ #endregion
[Route("Gy_Supplier/SaveGy_SupplierListApi")]
[HttpPost]
@@ -428,32 +480,50 @@
try
{
var _value = msg["model"].ToString();
+ LogService.Write("1" + _value);
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鍙嶅簭鍒楀寲
_value = "[" + _value.ToString() + "]";
List<Supplier> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(_value);
string sql = string.Empty;
+ LogService.Write("2");
//淇濆瓨
oCN.BeginTran();
sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
+ LogService.Write("3");
oCN.RunProc(sql);
sql = "set identity_insert Gy_Supplier on";
oCN.RunProc(sql);
+ LogService.Write("渚涘簲鍟嗗悓姝�" + @"Insert Into Gy_Supplier " +
+ "(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
+ ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
+ ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID,HUseOrgID,HCreateOrgID) " +
+ " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
+ "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
+ ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
+ ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
+ ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
+ ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID + ",'" + lsmain[0].HMaterClass +
+ "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
+ "') ");
oCN.RunProc("Insert Into Gy_Supplier " +
"(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark" +
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID,HUseOrgID,HCreateOrgID) " +
" values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
"," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+
- "'," + lsmain[0].HItemID +
- ") ");
+ "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
+ "') ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Supplier off";
oCN.RunProc(sql);
@@ -480,7 +550,6 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
-
[Route("Gy_Supplier/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
@@ -517,7 +586,7 @@
string HAddress = list[0].HAddress;
string HLinkMan = list[0].HLinkMan;
string HLinkPhone = list[0].HLinkPhone;
- string HBankAccount = list[0].HMobilePhone;
+ string HBankAccount = list[0].HBankAccount;
string HFax = list[0].HFax;
string HPostalCode = list[0].HPostalCode;
string HEmail = list[0].HEmail;
@@ -552,6 +621,10 @@
return objJsonResult;
}
+ if(HItemID == 0) // 浣跨敤鏂板鍑芥暟
+ {
+
+ }
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -694,12 +767,36 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_Supplier_BeforeDelCtrl " + HItemID + ",'" + User + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_Supplier_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
oCN.BeginTran();
//
if (oGroup.DeleteByID(HItemID))
{
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+ oCN.RunProc("delete from Gy_Supplier_Link where HSupID='" + HItemID + "'");
oCN.Commit();
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oGroupHlp.omodel.HNumber + ",鍚嶇О锛�" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
--
Gitblit v1.9.1