From 5bcd00a788426eeab0621711a7882ec9a10394f3 Mon Sep 17 00:00:00 2001 From: 仲国强 <519541279@qq.com> Date: 星期三, 01 九月 2021 10:27:53 +0800 Subject: [PATCH] 1 --- WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 ++++++++-------- WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 25 ++++++++---- WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 16 +++++++- WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 17 ++++++-- 4 files changed, 61 insertions(+), 31 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs index 9e8b539..3db4fde 100644 --- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs @@ -31,12 +31,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere, "h_v_Gy_CustomerList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList"); } else { string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + " order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -77,8 +77,17 @@ { try { - ds = oCN.RunProcReturn("select * from Gy_Customer where HItemID=" + HInterID, "Gy_Customer"); - + string sql = string.Format(@"select c.HItemID,c.HNumber 瀹㈡埛浠g爜,c.HName 瀹㈡埛鍚嶇О,c.HHelpCode 鍔╄鐮�,c.HShortName 绠�绉�,c.HAddress 鍦板潃,c.HLinkMan 鑱旂郴浜�,c.HLinkPhone 鑱旂郴鐢佃瘽 + ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠h〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿, + c.HTaxNum 绋庡姟鐧昏鍙�,c.HTaxRate 澧炲�肩◣鐜�,c.HEnglishName 鑻辨枃鍚嶇О,c.HEngLishAddress 鑻辨枃鍦板潃,c.HCountry 鍥藉,c.HCusStatus 瀹㈡埛鐘舵�� + ,c.HStopflag 绂佺敤鏍囧織,c.HRemark 澶囨敞,c.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,c.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵, + c.HSSID 缁撶畻鏂瑰紡ID,s.HName 缁撶畻鏂瑰紡,c.HCusTypeID 瀹㈡埛鍒嗙被ID,t.HName 瀹㈡埛鍒嗙被 from Gy_Customer c + left join Gy_AreaSet a on c.HAreaID=a.HItemID + left join Gy_Currency r on c.HCurID=r.HItemID + left join Gy_SettleStyle s on c.HSSID=s.HItemID + left join Gy_CusType t on c.HCusTypeID=t.HItemID + where c.HItemID='" + HInterID + "'"); + ds = oCN.RunProcReturn(sql, "Gy_Customer"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = ""; @@ -255,7 +264,7 @@ ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" + ",HCusTypeID) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID + - ", " + HLevel + ",0,0,'" + HRemark + "'" + + ", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" + ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" + ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" + ",'" + HTaxNum + "'," + HTaxRate + ",'" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" + @@ -381,7 +390,7 @@ return objJsonResult; } - + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� oCN.BeginTran(); @@ -390,8 +399,8 @@ " HNumber='" + HNumber + "'" + ",HName='" + HName + "'" + ",HShortNumber='" + HShortNumber + "'" + - ",HLevel ='"+ HLevel + "'" + - ",HEndFlag ='" + HEndFlag + "'" + + ",HLevel ='" + HLevel + "'" + + ",HEndFlag ='" + HEndFlag + "'" + ",HParentID='" + HParentID + "'" + ",HStopflag ='" + HStopflag + "'" + ",HHelpCode ='" + HHelpCode + "'" + diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs index e133101..696f98c 100644 --- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs @@ -31,12 +31,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList"); } else { string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + " order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -109,7 +109,16 @@ { try { - ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier"); + 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 娉曚汉浠h〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿, + 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 + 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 + where s.HItemID='" + HInterID + "'"); + ds = oCN.RunProcReturn(sql, "Gy_Supplier"); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -209,7 +218,7 @@ ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" + ",HEnglishAddress,HCurID,HSSID,HAreaID) " + " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" + - "," + HLevel + ",'0','0','" + HRemark + "'" + + "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" + ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" + ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" + ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" + diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs index eb49fec..9434b26 100644 --- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs +++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs @@ -515,7 +515,18 @@ public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList"); + DataSet ds; + if (sWhere == null || sWhere.Equals("")) + { + ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit"); + } + else + { + string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 "; + string sql = sql1 + sWhere; + ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit"); + } + return ds; } #endregion @@ -1638,6 +1649,7 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string msg4 = sArray[2].ToString(); string UserName = ""; @@ -1651,7 +1663,7 @@ lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2); foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain) { - //oItem.HMaker = ""; + oItem.HMaker = msg4; UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "3817"; oItem.HBillSubType = "3817"; diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index ad5e931..02b0985 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -18,25 +18,25 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>09/01/2021 10:17:02</publishTime> + <publishTime>08/31/2021 16:28:48</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>09/01/2021 10:17:02</publishTime> + <publishTime>08/31/2021 16:28:48</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>09/01/2021 10:17:00</publishTime> + <publishTime>08/31/2021 16:28:46</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>09/01/2021 10:17:00</publishTime> + <publishTime>08/31/2021 16:28:46</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>09/01/2021 10:16:59</publishTime> + <publishTime>08/31/2021 16:28:44</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>09/01/2021 10:16:59</publishTime> + <publishTime>08/31/2021 16:28:44</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> @@ -60,10 +60,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>09/01/2021 10:16:59</publishTime> + <publishTime>08/31/2021 16:28:45</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>09/01/2021 10:16:59</publishTime> + <publishTime>08/31/2021 16:28:45</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/25/2021 20:46:11</publishTime> @@ -72,22 +72,22 @@ <publishTime>08/04/2014 04:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>09/01/2021 10:16:57</publishTime> + <publishTime>08/31/2021 16:28:42</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>09/01/2021 10:16:57</publishTime> + <publishTime>08/31/2021 16:28:42</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>09/01/2021 10:16:58</publishTime> + <publishTime>08/31/2021 16:28:43</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>09/01/2021 10:16:58</publishTime> + <publishTime>08/31/2021 16:28:43</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>09/01/2021 10:16:58</publishTime> + <publishTime>08/31/2021 16:28:43</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>09/01/2021 10:16:58</publishTime> + <publishTime>08/31/2021 16:28:43</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -189,10 +189,10 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>09/01/2021 10:17:03</publishTime> + <publishTime>08/31/2021 16:28:49</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>09/01/2021 10:17:03</publishTime> + <publishTime>08/31/2021 16:28:49</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -363,7 +363,7 @@ <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> - <publishTime>09/01/2021 10:17:09</publishTime> + <publishTime>08/31/2021 16:28:55</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file -- Gitblit v1.9.1