From 7b776d93b25a2e9d6e2210d581c1e2998e4fc8ae Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 05 八月 2024 17:32:18 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 9f1f8b7..8f11c57 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -134,11 +134,14 @@
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)
@@ -165,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;
@@ -220,9 +224,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -242,6 +243,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;
+ 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;
@@ -333,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);
@@ -378,7 +396,7 @@
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;
@@ -439,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;
@@ -499,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);
//鏇存柊涓婄骇涓� 鏈骇
@@ -513,6 +551,7 @@
}
else
{
+ oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触";
--
Gitblit v1.9.1