| WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Models/ClsGy_Supplier_PayPlan.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; } //若MAINDI重复则重新获取 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(); //列表主ID string msg4 = sArray[2].ToString(); //登录人员 string msg5 = sArray[3].ToString(); //权限模块代码 string msg3 = sArray[1].ToString(); //子表数据 string msg4 = sArray[2].ToString(); //列表主ID 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 = "删除失败"; WebAPI/Models/ClsGy_Supplier_PayPlan.cs
New file @@ -0,0 +1,19 @@ using System; using System.Collections.Generic; using System.Text; namespace WebAPI.Models { public class ClsGy_Supplier_PayPlan { public Int64 HSupID;// int --供应商 （Gy_Supplier） public Int64 HSubID;// int 子内码 public Int64 HSubItemID;// int 自增列 public string HPayType;// varchar(50) 付款阶段 （例如 首付，第二笔，尾款 等 手工输入） public Int64 HPayRate;// money 付款比例% （例如 10% 50% 40%,输入数字） public Int64 HPayTime;// int 结算周期 （例如 0 ， 1， 2， 3， 6 代表 票到后几个月付款（应收单的日期就是 发票到的日期 ）） public string HPayRemark;// varchar(500) 备注说明 } } WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -23,12 +23,12 @@ <File Include="bin/BLL.dll"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> <publishTime>08/01/2024 15:53:16</publishTime> <publishTime>08/02/2024 10:15:13</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> <publishTime>08/01/2024 15:53:16</publishTime> <publishTime>08/02/2024 10:15:13</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> @@ -36,12 +36,12 @@ <File Include="bin/DAL.dll"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> <publishTime>08/01/2024 15:53:14</publishTime> <publishTime>08/02/2024 10:15:11</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> <publishTime>08/01/2024 15:53:14</publishTime> <publishTime>08/02/2024 10:15:11</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> @@ -49,12 +49,12 @@ <File Include="bin/DBUtility.dll"> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>11/15/2022 13:55:23</publishTime> <publishTime>08/01/2024 15:53:09</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/09/2022 16:01:58</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>08/01/2024 15:53:09</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -110,12 +110,12 @@ <File Include="bin/Model.dll"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>08/01/2024 15:53:10</publishTime> <publishTime>08/02/2024 10:15:07</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>08/01/2024 15:53:10</publishTime> <publishTime>08/02/2024 10:15:07</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -150,33 +150,33 @@ <File Include="bin/Pub_Class.dll"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> <publishTime>08/01/2024 15:53:08</publishTime> <publishTime>08/02/2024 10:15:05</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> <publishTime>08/01/2024 15:53:08</publishTime> <publishTime>08/02/2024 10:15:05</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> <publishTime>08/01/2024 15:53:08</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> <publishTime>08/01/2024 15:53:08</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>08/01/2024 15:53:09</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> <publishTime>08/01/2024 15:53:09</publishTime> <publishTime>08/02/2024 10:15:06</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -295,7 +295,7 @@ <File Include="bin/WebAPI.dll"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> <publishTime>08/01/2024 15:53:22</publishTime> <publishTime>08/02/2024 10:15:18</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/15/2021 17:59:43</publishTime> @@ -303,7 +303,7 @@ <File Include="bin/WebAPI.pdb"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> <publishTime>08/01/2024 15:53:22</publishTime> <publishTime>08/02/2024 10:15:18</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -512,7 +512,7 @@ <File Include="Web.config"> <publishTime>11/14/2022 11:24:08</publishTime> <publishTime>11/02/2022 22:03:20</publishTime> <publishTime>08/01/2024 15:54:18</publishTime> <publishTime>08/02/2024 10:16:25</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj
@@ -755,6 +755,7 @@ <Compile Include="HttpClient.cs" /> <Compile Include="InvokeHelper.cs" /> <Compile Include="Log.cs" /> <Compile Include="Models\ClsGy_Supplier_PayPlan.cs" /> <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" /> <Compile Include="Models\ClsGy_MouldFileBillSub_MaintainRule.cs" /> <Compile Include="Models\ClsGy_MateMould.cs" />
