From be6c4a362a7dec697733cf07734f441e58dff46d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 06 八月 2024 17:30:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 103 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 27 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index ca5b38e..8f11c57 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -121,21 +121,27 @@
{
try
{
- string sql = string.Format(@"select s.HItemID,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode 鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
- ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠ｈ〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,
+ string sql = string.Format(@"select s.HItemID,s.HUSEORGID,o.Hname 浣跨敤缁勭粐,s.HCREATEORGID ,d.Hname 鍒涘缓缁勭粐,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode 鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
+ ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠ｈ〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,s.HPSStyleID 閲囪喘鏂瑰紡ID,f.HName 閲囪喘鏂瑰紡鍚嶇О,
s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
- s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡 from Gy_Supplier s
+ s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡,s.HMaterClass 渚涜揣鏉愭枡绫诲埆 from Gy_Supplier s
left join Gy_AreaSet a on s.HAreaID=a.HItemID
left join Gy_Currency r on s.HCurID=r.HItemID
left join Gy_SettleStyle e on s.HSSID=e.HItemID
+ left join Xt_ORGANIZATIONS o on s.HUSEORGID=o.HItemID
+ left join Xt_ORGANIZATIONS d on s.HCREATEORGID=d.HItemID
+ left join Gy_PoStockStyle f on s.HPSStyleID=f.HItemID
where s.HItemID='" + HInterID + "'");
ds = oCN.RunProcReturn(sql, "Gy_Supplier");
-
+ DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '"+ HInterID + "'", "Gy_Supplier_PayPlan");
+ List<Object> list = new List<object>();
+ list.Add(cs);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = list;
return objJsonResult;
}
catch (Exception e)
@@ -162,15 +168,16 @@
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ //涓昏〃鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
DAL.ClsGy_Supplier_Ctl oDept = new DAL.ClsGy_Supplier_Ctl();
DAL.ClsGy_Supplier_View oDeptHlp = new DAL.ClsGy_Supplier_View();
-
-
- List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);
+ List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
long HItemID = list[0].HInterID;
string HNumber = list[0].HNumber;
@@ -206,7 +213,8 @@
long HCreateOrgID = list[0].HCreateOrgID;
long HUseOrgID = list[0].HUseOrgID;
string HRemark = list[0].HRemark;
-
+ string HMaterClass = list[0].HMaterClass;
+ long HPSStyleID = list[0].HPSStyleID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -216,9 +224,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -228,16 +233,32 @@
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
- "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
+ "," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
- ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +
- ") ");
+ ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID +
+ "') ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //瀛愯〃娣诲姞
+ List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
+ int i = 0;
+ DataSet Cs;
+ Cs = oCN.RunProcReturn("select MAX(HItemID)HItemID from Gy_Supplier", "Gy_Supplier");
+ string MaxHItemID = Cs.Tables[0].Rows[0]["HItemID"].ToString();
+ //鍒犻櫎瀛愯〃鎿嶄綔 闃叉鍑洪敊
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + MaxHItemID + "'");
+ foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
+ {
+ i++;
+ oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
+ (HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
+ values({MaxHItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
+ }
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -270,7 +291,7 @@
string sql = string.Empty;
//淇濆瓨
oCN.BeginTran();
- sql = $"delete Gy_Supplier where HItemID = {lsmain[0].HItemID}";
+ sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
oCN.RunProc(sql);
sql = "set identity_insert Gy_Supplier on";
oCN.RunProc(sql);
@@ -280,13 +301,14 @@
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID) " +
" 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].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+
+ "'," + lsmain[0].HItemID +
") ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Supplier off";
@@ -328,9 +350,10 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
- string msg3 = sArray[1].ToString(); //鍒楄〃涓籌D
- string msg4 = sArray[2].ToString(); //鐧诲綍浜哄憳
- string msg5 = sArray[3].ToString(); //鏉冮檺妯″潡浠ｇ爜
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string msg4 = sArray[2].ToString(); //鍒楄〃涓籌D
+ string msg5 = sArray[3].ToString(); //鐧诲綍浜哄憳
+ string msg6 = sArray[4].ToString(); //鏉冮檺妯″潡浠ｇ爜
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
@@ -369,10 +392,11 @@
long HCreateOrgID = list[0].HCreateOrgID;
long HUseOrgID = list[0].HUseOrgID;
string HRemark = list[0].HRemark;
-
+ string HMaterClass = list[0].HMaterClass;
+ long HPSStyleID = list[0].HPSStyleID;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+ if (!ClsPub.Security_Log(msg6, 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -421,7 +445,11 @@
",HEnglishAddress='" + HEnglishAddress + "'" +
",HCurID=" + HCurID.ToString() +
",HSSID=" + HSSID.ToString() +
- ",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HMaterClass='" + HMaterClass +
+ "',HPSStyleID='"+ HPSStyleID.ToString() +
+ "',HUSEORGID='" + HUseOrgID.ToString() +
+ "',HCREATEORGID='" + HCreateOrgID.ToString() +
+ "',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
@@ -429,6 +457,22 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
+
+ //瀛愯〃娣诲姞
+ List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
+ int i = 0;
+ //鍒犻櫎瀛愯〃鎿嶄綔 闃叉鍑洪敊
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+ foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
+ {
+ i++;
+ oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
+ (HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
+ values({HItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
+ }
+
+
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -489,9 +533,13 @@
objJsonResult.data = null;
return objJsonResult;
}
+ oCN.BeginTran();
//
if (oGroup.DeleteByID(HItemID))
{
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+ oCN.Commit();
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oGroupHlp.omodel.HNumber + ",鍚嶇О锛�" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
@@ -503,6 +551,7 @@
}
else
{
+ oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触";
@@ -855,7 +904,7 @@
,HPAYCONDITION
)
values
- ({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}',
+ ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
'{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID},{jsonData.HPAYCONDITION})";
oCN.RunProc(sql);
--
Gitblit v1.9.1