diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index eabef08f..92ce933b 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index ab290041..18bce4d6 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1214,6 +1214,31 @@ namespace BLL } return list; } + + public static DataTable ToDataTable(this T[] entities) + { + DataTable dataTable = new DataTable(typeof(T).Name); + + PropertyInfo[] properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); + + foreach (PropertyInfo propInfo in properties) + { + dataTable.Columns.Add(propInfo.Name, propInfo.PropertyType); + } + + foreach (T entity in entities) + { + object[] values = new object[properties.Length]; + for (int i = 0; i < properties.Length; i++) + { + values[i] = properties[i].GetValue(entity); + } + + dataTable.Rows.Add(values); + } + + return dataTable; + } /// /// 在设定的数值内产生随机数的数量 /// diff --git a/SGGL/BLL/PHTGL/ContractCompile/PHTGL_ApproveService.cs b/SGGL/BLL/PHTGL/ContractCompile/PHTGL_ApproveService.cs index 3562d8f2..42b34d15 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PHTGL_ApproveService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PHTGL_ApproveService.cs @@ -17,6 +17,8 @@ namespace BLL public const string SetSubReview = "SetSubReview"; public const string ContractReview = "ContractReview"; public const string ContractReview_Countersign = "ContractReview_Countersign"; + public const string Invoice_Input = "Invoice_Input"; + public const string Invoice_Output = "Invoice_Output"; public static Model.PHTGL_Approve GetPHTGL_ApproveById(string ApproveId) { @@ -170,7 +172,7 @@ namespace BLL /// public static List GetApproves_NopushOa() { - var q = (from x in Funs.DB.PHTGL_Approve where x.IsPushOa == 0 && x.ApproveMan != "" select x).ToList(); + var q = (from x in Funs.DB.PHTGL_Approve where x.IsPushOa == 0 && x.ApproveMan != "" && x.State==0 select x).ToList(); return q; } /// diff --git a/SGGL/BLL/PHTGL/InvoiceManage/PhtglInvoiceService .cs b/SGGL/BLL/PHTGL/InvoiceManage/PhtglInvoiceService .cs index 7d65e020..4a49c8f7 100644 --- a/SGGL/BLL/PHTGL/InvoiceManage/PhtglInvoiceService .cs +++ b/SGGL/BLL/PHTGL/InvoiceManage/PhtglInvoiceService .cs @@ -3,13 +3,16 @@ using FineUIPro; using MiniExcelLibs; using MiniExcelLibs.Attributes; using Model; +using NPOI.SS.Formula.Eval; using NPOI.SS.Formula.Functions; +using Org.BouncyCastle.Security; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Linq; using System.Runtime.CompilerServices; +using System.Security.Cryptography; using System.Text; using WIA; @@ -108,7 +111,7 @@ namespace BLL where (string.IsNullOrEmpty(table.InvoiceId) || x.InvoiceId.Contains(table.InvoiceId)) && (string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId)) && - (string.IsNullOrEmpty(table.ContractId) || x.ProjectId.Contains(table.ContractId)) && + (string.IsNullOrEmpty(table.ContractId) || x.ContractId.Contains(table.ContractId)) && (string.IsNullOrEmpty(table.InvoiceCode) || x.InvoiceCode.Contains(table.InvoiceCode)) && (string.IsNullOrEmpty(table.InvoiceNumber) || x.InvoiceNumber.Contains(table.InvoiceNumber)) && (string.IsNullOrEmpty(table.SellerName) || x.SellerName.Contains(table.SellerName)) && @@ -174,9 +177,29 @@ namespace BLL }); } - public static IEnumerable GetOrderInListData(Model.PHTGL_Invoice table, Grid grid1) + + public static IEnumerable GetOrderInListData(Model.PHTGL_Invoice table, Grid grid1,string state) { var q = GetPHTGL_InvoiceByModle(table); + + switch (state) + { + case "0": q = q.Where(x => x.State > StateDataIn); //鍏ㄩ儴 + break; + case "1": + q = q.Where(x => x.State > StateDataIn &&x.State< StateInPutApproveSuccess); //鏈叆搴 + break; + case "2": + q = q.Where(x => x.State >= StateInPutApproveSuccess ); //宸插叆搴 + break; + case "3": + q = q.Where(x => x.State >=StateInPutApproveSuccess && x.State < StateOutPutApproveSuccess);//鏈嚭搴 + break; + case "4": + q = q.Where(x => x.State == StateOutPutApproveSuccess);//宸插嚭搴 + break; + + } Count = q.Count(); if (Count == 0) { @@ -224,6 +247,60 @@ namespace BLL return Funs.DB.PHTGL_Invoice.FirstOrDefault(x => x.InvoiceId == InvoiceId); } + public static PHTGL_InvoicePrintModel GetPHTGL_InvoicePrintModel(string InvoiceId) + { + var result = new PHTGL_InvoicePrintModel(); + Order order = new Order(); + List orderDetails = new List(); + OrderApproveIn orderApproveIn = new OrderApproveIn(); + OrderApproveOut orderApproveOut = new OrderApproveOut(); + + var invoiceModel = GetPHTGL_InvoiceById(InvoiceId); + var invoiceDetail = PhtglInvoicedetailService.GetPHTGL_InvoiceDetailByInvoiceId(InvoiceId); + var approveManModels = GetInvoiceApproveManEntity(InvoiceId); + //灏唅nvoiceModel 鏄犲皠鍒皁rder + var mapper = EmitMapper.ObjectMapperManager.DefaultInstance.GetMapper(); + order=mapper.Map(invoiceModel); + order.ProjectName=ProjectService.GetProjectNameByProjectId(invoiceModel.ProjectId); + order.ContractCode=ContractService.GetContractById(invoiceModel.ContractId)?.ContractNum; + //invoiceDetail 鏄犲皠鍒皁rderDetails + var mapper2 = EmitMapper.ObjectMapperManager.DefaultInstance.GetMapper, List>(); + orderDetails = mapper2.Map(invoiceDetail); + orderDetails= orderDetails.Select(x => new OrderDetail + { + GoodsOrServicesName = x.GoodsOrServicesName, + SpecificationModel = x.SpecificationModel, + Unit = x.Unit, + Quantity = x.Quantity, + UnitPrice = x.UnitPrice, + NoTaxPrice = x.Amount - x.Tax, + TaxRate = string.Format("{0:P0}", Convert.ToDecimal(x.TaxRate) ), + Tax =x.Tax , + Amount = x.Amount, + }).ToList(); + if (approveManModels!=null) + { + orderApproveIn.ProjectManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProjectManager) : ""; + orderApproveIn.ControlManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ControlManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ControlManager) : ""; + orderApproveIn.ConstructionManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ConstructionManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ConstructionManager) : ""; + orderApproveIn.ProfessionalEngineer = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProfessionalEngineer) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProfessionalEngineer) : ""; + + orderApproveOut.ProjectManager = !string.IsNullOrEmpty(approveManModels.OutputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.OutputApproveMan.ProjectManager) : ""; + orderApproveOut.ControlManager = !string.IsNullOrEmpty(approveManModels.OutputApproveMan.ControlManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.OutputApproveMan.ControlManager) : ""; + orderApproveOut.PurchasingMan = !string.IsNullOrEmpty(approveManModels.OutputApproveMan.PurchasingMan) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.OutputApproveMan.PurchasingMan) : ""; + orderApproveOut.ConUnitMaterialOfficer = !string.IsNullOrEmpty(approveManModels.OutputApproveMan.ConUnitMaterialOfficer) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.OutputApproveMan.ConUnitMaterialOfficer) : ""; + orderApproveOut.ConUnitProjectManager = !string.IsNullOrEmpty(approveManModels.OutputApproveMan.ConUnitProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.OutputApproveMan.ConUnitProjectManager) : ""; + + } + + + result.Order = order; + result.Data = orderDetails; + result.ApproveIn = orderApproveIn; + result.ApproveOut = orderApproveOut; + return result; + } + /// /// 娣诲姞瀹炰綋 /// @@ -518,6 +595,7 @@ namespace BLL _Approve.State = 0; _Approve.IsAgree = 0; _Approve.ApproveIdea = ""; + _Approve.IsPushOa = 0; _Approve.ApproveType = approveManModels.Rolename; _Approve.ApproveForm =(type==0? "Invoice_Input": "Invoice_Output"); BLL.PHTGL_ApproveService.AddPHTGL_Approve(_Approve); @@ -580,6 +658,8 @@ namespace BLL model.State = (type == 0 ? StateInPutApproveRefuse : StateOutPutApproveRefuse); UpdatePHTGL_Invoice(model); } + OAWebSevice.Pushoa(); + OAWebSevice.DoneRequest(thisApprovemodel.ApproveId); } } diff --git a/SGGL/BLL/PHTGL/OAWebSevice.cs b/SGGL/BLL/PHTGL/OAWebSevice.cs index ea6f97b8..83ccfbc1 100644 --- a/SGGL/BLL/PHTGL/OAWebSevice.cs +++ b/SGGL/BLL/PHTGL/OAWebSevice.cs @@ -5,7 +5,14 @@ namespace BLL { public static class OAWebSevice { - + /// + /// 鑾峰彇鎺ㄩ丱A鐨凱Curl + /// + /// + /// + /// + /// + /// public static string geturl(string projectid, string formname, string ID, string personId) { //string SGGLUrl = Funs.SGGLUrl.Substring(Funs.SGGLUrl.IndexOf("//")+2); @@ -37,12 +44,26 @@ namespace BLL case ActionPlanListApproveService.ActionPlanListEdit: PHTUrl = string.Format("PHTUrl=ZHGL/Plan/ActionPlanListEdit.aspx?ActionPlanListId={0}", ID); break; + case PHTGL_ApproveService.Invoice_Input: + PHTUrl = string.Format("PHTUrl=PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId={0}&Type=0", ID); + break; + case PHTGL_ApproveService.Invoice_Output: + PHTUrl = string.Format("PHTUrl=PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId={0}&Type=1", ID); + break; } url = url + PHTUrl; //LogService.AddSys_Log(Person_PersonsService.GetPerson_PersonsById(personId),"", ID, "ActionPlanListEdit",url); return url; } + /// + /// 鑾峰彇鎺ㄩ丱A鐨凙ppurl + /// + /// + /// + /// + /// + /// public static string getAppurl(string projectid, string formname, string ID, string userid) { string mobileWebUrl = Funs.MobileWebUrl; @@ -65,12 +86,18 @@ namespace BLL case PHTGL_ApproveService.ContractReview: PHTUrl = string.Format("PHTGL/ContractCompile/{0}Detail.aspx?ContractReviewId={1}&PersonId={2}", formname, ID, userid); break; + case PHTGL_ApproveService.Invoice_Input: + PHTUrl = string.Format("PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId={0}&Type=0&PersonId={1}", ID, userid); + break; + case PHTGL_ApproveService.Invoice_Output: + PHTUrl = string.Format("PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId={0}&Type=1&PersonId={1}", ID, userid); + break; } url = url + PHTUrl; return url; } /// - /// 鑾峰彇瀹℃壒琛ㄥ崟涓荤晫闈 + /// 鑾峰彇瀹℃壒琛ㄥ崟涓荤晫闈(鐢ㄤ簬鎺ㄩ佺粰鍒涘缓鑰) /// /// /// @@ -103,6 +130,12 @@ namespace BLL case PHTGL_ApproveService.ContractReview_Countersign: PHTUrl = string.Format("PHTUrl=PHTGL/ContractCompile/{0}.aspx", formname); break; + case PHTGL_ApproveService.Invoice_Input: + PHTUrl = string.Format("PHTUrl=PHTGL/InvoiceManage/InvoiceOrder.aspx"); + break; + case PHTGL_ApproveService.Invoice_Output: + PHTUrl = string.Format("PHTUrl=PHTGL/InvoiceManage/InvoiceOrder.aspx"); + break; } url = url + PHTUrl; return url; @@ -226,6 +259,38 @@ namespace BLL } break; + case PHTGL_ApproveService.Invoice_Input: + var invoice = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(users.ContractId); + if (invoice != null) + { + var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(invoice.CreateUser); + var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(users.ApproveMan); + var project = BLL.ProjectService.GetProjectByProjectId(invoice.ProjectId); + webJson.flowid = users.ApproveId; + webJson.requestname = "鍏ュ簱鍗曞鎵(琚嫆) " + project.ProjectName; + webJson.nodename = users.ApproveType; + webJson.creator = geCreatUser.JobNum; + webJson.receiver = gereceiver.JobNum; + webJson.pcurl = geturl_Form(invoice.ProjectId, PHTGL_ApproveService.Invoice_Input, gereceiver.PersonId); + webJson.appurl = getAppurl(invoice.ProjectId, PHTGL_ApproveService.Invoice_Input, invoice.InvoiceId, gereceiver.PersonId); + } + break; + case PHTGL_ApproveService.Invoice_Output: + var invoice_output = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(users.ContractId); + if (invoice_output != null) + { + var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(invoice_output.CreateUser); + var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(users.ApproveMan); + var project = BLL.ProjectService.GetProjectByProjectId(invoice_output.ProjectId); + webJson.flowid = users.ApproveId; + webJson.requestname = "鍑哄簱鍗曞鎵(琚嫆) " + project.ProjectName; + webJson.nodename = users.ApproveType; + webJson.creator = geCreatUser.JobNum; + webJson.receiver = gereceiver.JobNum; + webJson.pcurl = geturl_Form(invoice_output.ProjectId, PHTGL_ApproveService.Invoice_Output, gereceiver.PersonId); + webJson.appurl = getAppurl(invoice_output.ProjectId, PHTGL_ApproveService.Invoice_Output, invoice_output.InvoiceId, gereceiver.PersonId); + } + break; } strjson = JsonConvert.SerializeObject(webJson); returnjson = OAWeb.receiveTodoRequestByJson(strjson); @@ -368,6 +433,38 @@ namespace BLL webJson.appurl = getAppurl(Con_Co.ProjectId, PHTGL_ApproveService.ContractReview, Ctr_Co.ContractReviewId, users[i].ApproveMan); } break; + case PHTGL_ApproveService.Invoice_Input: + var invoice = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(users[i].ContractId); + if (invoice != null) + { + var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(invoice.CreateUser); + var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(users[i].ApproveMan); + var project = BLL.ProjectService.GetProjectByProjectId(invoice.ProjectId); + webJson.flowid = users[i].ApproveId; + webJson.requestname = "鍏ュ簱鍗曞鎵 " + project.ProjectName; + webJson.nodename = users[i].ApproveType; + webJson.creator = geCreatUser.JobNum; + webJson.receiver = gereceiver.JobNum; + webJson.pcurl = geturl(invoice.ProjectId, PHTGL_ApproveService.Invoice_Input, invoice.InvoiceId, users[i].ApproveMan); + webJson.appurl = getAppurl(invoice.ProjectId, PHTGL_ApproveService.Invoice_Input, invoice.InvoiceId, users[i].ApproveMan); + } + break; + case PHTGL_ApproveService.Invoice_Output: + var invoice_output = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(users[i].ContractId); + if (invoice_output != null) + { + var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(invoice_output.CreateUser); + var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(users[i].ApproveMan); + var project = BLL.ProjectService.GetProjectByProjectId(invoice_output.ProjectId); + webJson.flowid = users[i].ApproveId; + webJson.requestname = "鍑哄簱鍗曞鎵 " + project.ProjectName; + webJson.nodename = users[i].ApproveType; + webJson.creator = geCreatUser.JobNum; + webJson.receiver = gereceiver.JobNum; + webJson.pcurl = geturl(invoice_output.ProjectId, PHTGL_ApproveService.Invoice_Output, invoice_output.InvoiceId, users[i].ApproveMan); + webJson.appurl = getAppurl(invoice_output.ProjectId, PHTGL_ApproveService.Invoice_Output, invoice_output.InvoiceId, users[i].ApproveMan); + } + break; } strjson = JsonConvert.SerializeObject(webJson); returnjson = OAWeb.receiveTodoRequestByJson(strjson); @@ -497,6 +594,12 @@ namespace BLL case PHTGL_ApproveService.ContractReview: webJson.requestname = "鍚堝悓瀹℃壒"; break; + case PHTGL_ApproveService.Invoice_Input: + webJson.requestname = "鍏ュ簱鍗曞鎵"; + break; + case PHTGL_ApproveService.Invoice_Output: + webJson.requestname = "鍑哄簱鍗曞鎵"; + break; } string strjson = JsonConvert.SerializeObject(webJson); var returnjson = OAWeb.processDoneRequestByJson(strjson); diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 9bc12b41..199aa2ba 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -457,6 +457,21 @@ namespace BLL } return userName; } + public static string getSignatureUrl(string personId) + { + string Url = string.Empty; + var getUser = Person_PersonsService.GetPerson_PersonsById(personId); + if (getUser != null) + { + Url = getUser.PersonName; + if (!string.IsNullOrEmpty(getUser.SignatureUrl)) + { + Url = Funs.RootPath + getUser.SignatureUrl; + + } + } + return Url; + } #endregion #region 鏍规嵁椤圭洰ID鍗曚綅ID 鑾峰彇浜哄憳涓嬫媺妗 锛堥」鐩鑹 涓斿彲瀹℃壒锛 diff --git a/SGGL/FineUIPro.Mobile/ErrLog.txt b/SGGL/FineUIPro.Mobile/ErrLog.txt index e69de29b..798a5d79 100644 --- a/SGGL/FineUIPro.Mobile/ErrLog.txt +++ b/SGGL/FineUIPro.Mobile/ErrLog.txt @@ -0,0 +1,156 @@ + +閿欒淇℃伅寮濮=====> +閿欒绫诲瀷:NullReferenceException +閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆 +閿欒鍫嗘爤: + 鍦 FineUIPro.Mobile.PHTGL.InvoiceManage.InvoiceOrderDetail.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Mobile\PHTGL\InvoiceManage\InvoiceOrderDetail.aspx.cs:琛屽彿 55 + 鍦 System.EventHandler.Invoke(Object sender, EventArgs e) + 鍦 System.Web.UI.Control.OnLoad(EventArgs e) + 鍦 System.Web.UI.Control.LoadRecursive() + 鍦 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +鍑洪敊鏃堕棿:05/12/2024 15:53:48 +鍑洪敊鏂囦欢:http://localhost:60276/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId=f8087626-f2e5-4cee-8765-54a1a942aac8&Type=0&PersonId=406007bf-c852-4e4d-aa32-060445fc26c4 +IP鍦板潃:::1 + +鍑洪敊鏃堕棿:05/12/2024 15:53:48 + +System.ServiceModel.EndpointNotFoundException: 娌℃湁缁堢粨鐐瑰湪渚﹀惉鍙互鎺ュ彈娑堟伅鐨 http://172.25.0.43/services/OfsTodoDataWebService銆傝繖閫氬父鏄敱浜庝笉姝ｇ‘鐨勫湴鍧鎴栬 SOAP 鎿嶄綔瀵艰嚧鐨勩傚鏋滃瓨鍦ㄦ鎯呭喌锛岃鍙傝 InnerException 浠ヤ簡瑙ｈ缁嗕俊鎭 ---> System.Net.WebException: 鏃犳硶杩炴帴鍒拌繙绋嬫湇鍔″櫒 ---> System.Net.Sockets.SocketException: 鐢变簬杩炴帴鏂瑰湪涓娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ 172.25.0.43:80 + 鍦 System.Net.Sockets.Socket.DoConnect(EndPoint endPointSnapshot, SocketAddress socketAddress) + 鍦 System.Net.ServicePoint.ConnectSocketInternal(Boolean connectFailure, Socket s4, Socket s6, Socket& socket, IPAddress& address, ConnectSocketState state, IAsyncResult asyncResult, Exception& exception) + --- 鍐呴儴寮傚父鍫嗘爤璺熻釜鐨勭粨灏 --- + 鍦 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) + 鍦 System.Net.HttpWebRequest.GetRequestStream() + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + --- 鍐呴儴寮傚父鍫嗘爤璺熻釜鐨勭粨灏 --- + +Server stack trace: + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + 鍦 System.ServiceModel.Channels.HttpOutput.Send(TimeSpan timeout) + 鍦 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.SendRequest(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 鍦 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 鍦 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortType.receiveTodoRequestByJson(String in0) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.receiveTodoRequestByJson(String in0) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\Service References\OAWebService\Reference.cs:琛屽彿 478 + 鍦 BLL.OAWebSevice.Pushoa() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\PHTGL\OAWebSevice.cs:琛屽彿 470 +System.ServiceModel.EndpointNotFoundException: 娌℃湁缁堢粨鐐瑰湪渚﹀惉鍙互鎺ュ彈娑堟伅鐨 http://172.25.0.43/services/OfsTodoDataWebService銆傝繖閫氬父鏄敱浜庝笉姝ｇ‘鐨勫湴鍧鎴栬 SOAP 鎿嶄綔瀵艰嚧鐨勩傚鏋滃瓨鍦ㄦ鎯呭喌锛岃鍙傝 InnerException 浠ヤ簡瑙ｈ缁嗕俊鎭 ---> System.Net.WebException: 鏃犳硶杩炴帴鍒拌繙绋嬫湇鍔″櫒 ---> System.Net.Sockets.SocketException: 鐢变簬杩炴帴鏂瑰湪涓娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ 172.25.0.43:80 + 鍦 System.Net.Sockets.Socket.DoConnect(EndPoint endPointSnapshot, SocketAddress socketAddress) + 鍦 System.Net.ServicePoint.ConnectSocketInternal(Boolean connectFailure, Socket s4, Socket s6, Socket& socket, IPAddress& address, ConnectSocketState state, IAsyncResult asyncResult, Exception& exception) + --- 鍐呴儴寮傚父鍫嗘爤璺熻釜鐨勭粨灏 --- + 鍦 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) + 鍦 System.Net.HttpWebRequest.GetRequestStream() + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + --- 鍐呴儴寮傚父鍫嗘爤璺熻釜鐨勭粨灏 --- + +Server stack trace: + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + 鍦 System.ServiceModel.Channels.HttpOutput.Send(TimeSpan timeout) + 鍦 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.SendRequest(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 鍦 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 鍦 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortType.receiveTodoRequestByJson(String in0) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.receiveTodoRequestByJson(String in0) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\Service References\OAWebService\Reference.cs:琛屽彿 478 + 鍦 BLL.OAWebSevice.Pushoa() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\PHTGL\OAWebSevice.cs:琛屽彿 470 + +閿欒淇℃伅寮濮=====> +閿欒绫诲瀷:EndpointNotFoundException +閿欒淇℃伅:娌℃湁缁堢粨鐐瑰湪渚﹀惉鍙互鎺ュ彈娑堟伅鐨 http://172.25.0.43/services/OfsTodoDataWebService銆傝繖閫氬父鏄敱浜庝笉姝ｇ‘鐨勫湴鍧鎴栬 SOAP 鎿嶄綔瀵艰嚧鐨勩傚鏋滃瓨鍦ㄦ鎯呭喌锛岃鍙傝 InnerException 浠ヤ簡瑙ｈ缁嗕俊鎭 +閿欒鍫嗘爤: + +Server stack trace: + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + 鍦 System.ServiceModel.Channels.HttpOutput.Send(TimeSpan timeout) + 鍦 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.SendRequest(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 鍦 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 鍦 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortType.processDoneRequestByJson(String in0) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.processDoneRequestByJson(String in0) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\Service References\OAWebService\Reference.cs:琛屽彿 406 + 鍦 BLL.OAWebSevice.DoneRequest(String id) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\PHTGL\OAWebSevice.cs:琛屽彿 605 + 鍦 BLL.PhtglInvoiceService.Approve(String invoiceId, Int32 type, String userid, Boolean isAgree, String idea) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\BLL\PHTGL\InvoiceManage\PhtglInvoiceService .cs:琛屽彿 662 + 鍦 FineUIPro.Mobile.PHTGL.InvoiceManage.InvoiceOrderDetail.btnAgree_Click(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Mobile\PHTGL\InvoiceManage\InvoiceOrderDetail.aspx.cs:琛屽彿 194 + 鍦 FineUIPro.Button.OnClick(EventArgs e) + 鍦 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +----閿欒绫诲瀷:WebException +----閿欒淇℃伅: +----鏃犳硶杩炴帴鍒拌繙绋嬫湇鍔″櫒 +----閿欒鍫嗘爤: + 鍦 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) + 鍦 System.Net.HttpWebRequest.GetRequestStream() + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() +--------閿欒绫诲瀷:SocketException +--------閿欒淇℃伅: +--------鐢变簬杩炴帴鏂瑰湪涓娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ 172.25.0.43:80 +--------閿欒鍫嗘爤: + 鍦 System.Net.Sockets.Socket.DoConnect(EndPoint endPointSnapshot, SocketAddress socketAddress) + 鍦 System.Net.ServicePoint.ConnectSocketInternal(Boolean connectFailure, Socket s4, Socket s6, Socket& socket, IPAddress& address, ConnectSocketState state, IAsyncResult asyncResult, Exception& exception) +鍑洪敊鏃堕棿:05/12/2024 15:57:50 +鍑洪敊鏂囦欢:http://localhost:60276/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId=f8087626-f2e5-4cee-8765-54a1a942aac8&Type=0&PersonId=406007bf-c852-4e4d-aa32-060445fc26c4 +IP鍦板潃:::1 + +鍑洪敊鏃堕棿:05/12/2024 15:57:50 + + +閿欒淇℃伅寮濮=====> +閿欒绫诲瀷:EndpointNotFoundException +閿欒淇℃伅:娌℃湁缁堢粨鐐瑰湪渚﹀惉鍙互鎺ュ彈娑堟伅鐨 http://172.25.0.43/services/OfsTodoDataWebService銆傝繖閫氬父鏄敱浜庝笉姝ｇ‘鐨勫湴鍧鎴栬 SOAP 鎿嶄綔瀵艰嚧鐨勩傚鏋滃瓨鍦ㄦ鎯呭喌锛岃鍙傝 InnerException 浠ヤ簡瑙ｈ缁嗕俊鎭 +閿欒鍫嗘爤: + +Server stack trace: + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() + 鍦 System.ServiceModel.Channels.HttpOutput.Send(TimeSpan timeout) + 鍦 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.SendRequest(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 鍦 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 鍦 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 鍦 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortType.processDoneRequestByJson(String in0) + 鍦 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.processDoneRequestByJson(String in0) + 鍦 BLL.OAWebSevice.DoneRequest(String id) + 鍦 BLL.PhtglInvoiceService.Approve(String invoiceId, Int32 type, String userid, Boolean isAgree, String idea) + 鍦 FineUIPro.Mobile.PHTGL.InvoiceManage.InvoiceOrderDetail.btnDisgree_Click(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Mobile\PHTGL\InvoiceManage\InvoiceOrderDetail.aspx.cs:琛屽彿 212 + 鍦 FineUIPro.Button.OnClick(EventArgs e) + 鍦 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +----閿欒绫诲瀷:WebException +----閿欒淇℃伅: +----鏃犳硶杩炴帴鍒拌繙绋嬫湇鍔″櫒 +----閿欒鍫嗘爤: + 鍦 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) + 鍦 System.Net.HttpWebRequest.GetRequestStream() + 鍦 System.ServiceModel.Channels.HttpOutput.WebRequestHttpOutput.GetOutputStream() +--------閿欒绫诲瀷:SocketException +--------閿欒淇℃伅: +--------鐢变簬杩炴帴鏂瑰湪涓娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ 172.25.0.43:80 +--------閿欒鍫嗘爤: + 鍦 System.Net.Sockets.Socket.DoConnect(EndPoint endPointSnapshot, SocketAddress socketAddress) + 鍦 System.Net.ServicePoint.ConnectSocketInternal(Boolean connectFailure, Socket s4, Socket s6, Socket& socket, IPAddress& address, ConnectSocketState state, IAsyncResult asyncResult, Exception& exception) +鍑洪敊鏃堕棿:05/12/2024 20:10:23 +鍑洪敊鏂囦欢:http://localhost:60276/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx?InvoiceId=f8087626-f2e5-4cee-8765-54a1a942aac8&Type=0&PersonId=e79671b9-6ea9-46c3-8aa1-b5ea057bd4bc +IP鍦板潃:::1 + +鍑洪敊鏃堕棿:05/12/2024 20:10:23 + diff --git a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj index c4c16785..57b9f43d 100644 --- a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj +++ b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj @@ -143,6 +143,7 @@ + @@ -3385,6 +3386,13 @@ ContractReviewDetail.aspx + + InvoiceOrderDetail.aspx + ASPXCodeBehind + + + InvoiceOrderDetail.aspx + imageUp.ashx diff --git a/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx new file mode 100644 index 00000000..8f109b8b --- /dev/null +++ b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx @@ -0,0 +1,179 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InvoiceOrderDetail.aspx.cs" Inherits="FineUIPro.Mobile.PHTGL.InvoiceManage.InvoiceOrderDetail" %> + + + + + + + + + + +
+
+ + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + diff --git a/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.cs new file mode 100644 index 00000000..fb299fc6 --- /dev/null +++ b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.cs @@ -0,0 +1,228 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Mobile.PHTGL.InvoiceManage +{ + public partial class InvoiceOrderDetail : PageBase + { + public string InvoiceId + { + get + { + return (string)ViewState["InvoiceId"]; + } + set + { + ViewState["InvoiceId"] = value; + } + } + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + public string PersonId + { + get + { + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; + } + set + { + ViewState["PersonId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + InvoiceId = Request.QueryString["InvoiceId"]; + Type = Request.QueryString["Type"]; + + Model.PHTGL_Invoice table = new Model.PHTGL_Invoice(); + table.InvoiceId = InvoiceId; + var invoiceModel = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(InvoiceId); + var ContractModel = BLL.ContractService.GetContractById(invoiceModel.ContractId); + + if (invoiceModel != null) + { + txtProjectName.Text = ProjectService.GetProjectNameByProjectId(invoiceModel.ProjectId); + txtContractNum.Text = ContractModel?.ContractNum; + txtSellerName.Text = invoiceModel.SellerName; + txtOrderInDate.SelectedDate = invoiceModel.OrderInDate; + txtInvoiceDate.Text = invoiceModel.InvoiceDate; + txtOrderCode.Text = invoiceModel.OrderCode; + txtInvoiceNumber.Text = invoiceModel.InvoiceNumber; + txtOrderOutDate.SelectedDate = invoiceModel.OrderOutDate; + txtMaterialRequisitionUnit.Text = invoiceModel.MaterialRequisitionUnit; + } + + BindGrid(); + BindApproveData(); + if (Type == "0") + { + Grid1.Title = "鍏ュ簱鍗曞垪琛"; + PanelOrderIn.Hidden = false; + } + else if (Type == "1") + { + PanelOrderOut.Hidden = false; + Grid1.Title = "鍑哄簱鍗曞垪琛"; + } + + if (invoiceModel.CreateUser == PersonId) //鍒涘缓浜 + { + // TbCreate.Hidden = false; + if (invoiceModel.State > PhtglInvoiceService.StateCreate) + { + Form_approve.Hidden = false; + } + } + + if (PHTGL_ApproveService.IsApprovingMan(InvoiceId, PersonId)) //鍒ゆ柇褰撳墠浜烘槸鍚﹀鎵逛汉 + { + TbApprove.Hidden = false; + Form_approve.Hidden = false; + + } + } + } + + public void BindApproveData() + { + var approveModel = PHTGL_ApproveService.GetAllApproveData(InvoiceId, Type == "0" ? "Invoice_Input" : "Invoice_Output"); + if (approveModel != null) + { + Grid2.DataSource = approveModel; + Grid2.DataBind(); + } + } + public void BindGrid() + { + var invoiceDetail = PhtglInvoicedetailService.GetPHTGL_InvoiceDetailByInvoiceId(InvoiceId); + Grid1.DataSource = invoiceDetail; + Grid1.DataBind(); + txtSumUnitPrice.Text = invoiceDetail.Sum(p => p.UnitPrice).ToString(); + txtSumTax.Text = invoiceDetail.Sum(p => p.Tax).ToString(); + txtSumAmount.Text = invoiceDetail.Sum(p => p.Amount).ToString(); + txtAmountInWords.Text = Funs.NumericCapitalization(invoiceDetail.Sum(p => p.Amount) ?? 0); + } + + + protected void Grid1_OnRowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "delete") + { + PhtglInvoicedetailService.DeletePHTGL_InvoiceDetailById(e.RowID); + BindGrid(); + } + } + + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + if (Type == "1") + { + Grid1.FindColumn("btnDelete").Hidden = true; + } + } + + protected string GetTaxRate(object eval) + { + string result = ""; + if (eval != null) + { + decimal taxRate = Convert.ToDecimal(eval); + string percentage = string.Format("{0:P0}", taxRate); + result = percentage.Replace("%", ""); + } + return result; + } + + protected string GetNoTaxPrice(object amount, object tax) + { + //鑾峰彇amount-tax 鐨勫 + string result = ""; + if (amount != null && tax != null) + { + decimal amountValue = Convert.ToDecimal(amount); + decimal taxValue = Convert.ToDecimal(tax); + decimal noTaxPrice = amountValue - taxValue; + result = noTaxPrice.ToString(); + } + return result; + } + + protected void btnSave_Click(object sender, EventArgs e) + { + var invoiceModel = BLL.PhtglInvoiceService.GetPHTGL_InvoiceById(InvoiceId); + invoiceModel.OrderInDate = txtOrderInDate.SelectedDate; + invoiceModel.OrderOutDate = txtOrderOutDate.SelectedDate; + invoiceModel.OrderCode = txtOrderCode.Text; + invoiceModel.MaterialRequisitionUnit = txtMaterialRequisitionUnit.Text; + BLL.PhtglInvoiceService.UpdatePHTGL_Invoice(invoiceModel); + ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); + } + + protected void btnEditProcess_Click(object sender, EventArgs e) + { + if (Type == "0") + { + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InvoiceOrderReviewEdit.aspx?InvoiceId={0}&&Type={1}", InvoiceId, "0", "缂栬緫 - "))); + } + else if (Type == "1") + { + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InvoiceOrderReviewEdit.aspx?InvoiceId={0}&&Type={1}", InvoiceId, "1", "缂栬緫 - "))); + } + } + + protected void btnAgree_Click(object sender, EventArgs e) + { + PhtglInvoiceService.Approve(InvoiceId, int.Parse(Type), PersonId, true, txtApproveIdea.Text); + ShowNotify("瀹℃壒鎴愬姛锛", MessageBoxIcon.Success); + if (!string.IsNullOrEmpty(Request.Params["PHTUrl"])) + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + PageContext.RegisterStartupScript("closeActiveTab();"); + + } + else + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + + } + + } + + protected void btnDisgree_Click(object sender, EventArgs e) + { + PhtglInvoiceService.Approve(InvoiceId, int.Parse(Type), PersonId, false, txtApproveIdea.Text); + ShowNotify("瀹℃壒鎴愬姛锛", MessageBoxIcon.Success); + if (!string.IsNullOrEmpty(Request.Params["PHTUrl"])) + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + PageContext.RegisterStartupScript("closeActiveTab();"); + + } + else + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + + } + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.designer.cs b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.designer.cs new file mode 100644 index 00000000..65eca825 --- /dev/null +++ b/SGGL/FineUIPro.Mobile/PHTGL/InvoiceManage/InvoiceOrderDetail.aspx.designer.cs @@ -0,0 +1,296 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Mobile.PHTGL.InvoiceManage +{ + + + public partial class InvoiceOrderDetail + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// TbApprove 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar TbApprove; + + /// + /// btnAgree 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAgree; + + /// + /// btnDisgree 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnDisgree; + + /// + /// Panel4 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel4; + + /// + /// txtProjectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtContractNum 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtContractNum; + + /// + /// txtSellerName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSellerName; + + /// + /// PanelOrderIn 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel PanelOrderIn; + + /// + /// txtOrderInDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtOrderInDate; + + /// + /// txtInvoiceDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtInvoiceDate; + + /// + /// txtOrderCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtOrderCode; + + /// + /// PanelOrderOut 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel PanelOrderOut; + + /// + /// txtOrderOutDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtOrderOutDate; + + /// + /// txtMaterialRequisitionUnit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtMaterialRequisitionUnit; + + /// + /// txtInvoiceNumber 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtInvoiceNumber; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lblPageIndex 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Label1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Label2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// txtSumUnitPrice 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSumUnitPrice; + + /// + /// txtSumTax 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSumTax; + + /// + /// txtSumAmount 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSumAmount; + + /// + /// txtAmountInWords 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtAmountInWords; + + /// + /// Form_approve 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form_approve; + + /// + /// txtApproveIdea 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtApproveIdea; + + /// + /// Grid2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// Label3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/鍙戠エ瀵煎叆妯＄増.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/鍙戠エ瀵煎叆妯＄増.xlsx index 2916650c..b70122e6 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/鍙戠エ瀵煎叆妯＄増.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/鍙戠エ瀵煎叆妯＄増.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍏ュ簱鍗.frx b/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍏ュ簱鍗.frx new file mode 100644 index 00000000..8a323cc9 --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍏ュ簱鍗.frx @@ -0,0 +1,279 @@ +锘 + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + + private void Table4_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Table1"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + Table4.PrintRow(0); + // each PrintRow call must be followed by either PrintColumn or PrintColumns call + // to print cells on the row + Table4.PrintColumns(); + + // now enumerate the data source and print the table body + + // print the table body + Table4.PrintRow(1); + Table4.PrintColumns(); + Table4.PrintRow(2); + Table4.PrintColumns(); + Table4.PrintRow(3); + Table4.PrintColumns(); + Table4.PrintRow(4); + Table4.PrintColumns(); + // go next data source row + rowData.Next(); + + } + + private void Table6_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("ApproveInData"); + // init the data source + rowData.Init(); + Table6.PrintRow(0); + Table6.PrintColumns(); + Table6.PrintRow(1); + Table6.PrintColumns(); + rowData.Next(); + } + + + private int x; + private void Tabel_Data_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + Tabel_Data.PrintRow(0); + // each PrintRow call must be followed by either PrintColumn or PrintColumns call + // to print cells on the row + Tabel_Data.PrintColumns(); + x=0; + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + x++; + // print the table body + Tabel_Data.PrintRow(1); + Tabel_Data.PrintColumns(); + + // go next data source row + rowData.Next(); + } + Tabel_Data.PrintRow(2); + Tabel_Data.PrintColumns(); + Tabel_Data.PrintRow(3); + Tabel_Data.PrintColumns(); + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍑哄簱鍗.frx b/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍑哄簱鍗.frx new file mode 100644 index 00000000..35711973 --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Fastreport/鍙戠エ瀛樿揣鍑哄簱鍗.frx @@ -0,0 +1,304 @@ +锘 + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + + private void Table4_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Table1"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + Table4.PrintRow(0); + // each PrintRow call must be followed by either PrintColumn or PrintColumns call + // to print cells on the row + Table4.PrintColumns(); + + // now enumerate the data source and print the table body + + // print the table body + Table4.PrintRow(1); + Table4.PrintColumns(); + Table4.PrintRow(2); + Table4.PrintColumns(); + Table4.PrintRow(3); + Table4.PrintColumns(); + // go next data source row + rowData.Next(); + + } + + private void Table6_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("ApproveOutData"); + // init the data source + rowData.Init(); + Table6.PrintRow(0); + Table6.PrintColumns(); + Table6.PrintRow(1); + Table6.PrintColumns(); + Table6.PrintRow(2); + Table6.PrintColumns(); + Table6.PrintRow(3); + Table6.PrintColumns(); + rowData.Next(); + } + + + private int x; + private void Tabel_Data_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + Tabel_Data.PrintRow(0); + // each PrintRow call must be followed by either PrintColumn or PrintColumns call + // to print cells on the row + Tabel_Data.PrintColumns(); + x=0; + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + x++; + // print the table body + Tabel_Data.PrintRow(1); + Tabel_Data.PrintColumns(); + + // go next data source row + rowData.Next(); + } + Tabel_Data.PrintRow(2); + Tabel_Data.PrintColumns(); + Tabel_Data.PrintRow(3); + Tabel_Data.PrintColumns(); + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/InvoiceManage/InvoiceOrder.aspx b/SGGL/FineUIPro.Web/PHTGL/InvoiceManage/InvoiceOrder.aspx index 6a77951a..e2a3a800 100644 --- a/SGGL/FineUIPro.Web/PHTGL/InvoiceManage/InvoiceOrder.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/InvoiceManage/InvoiceOrder.aspx @@ -30,31 +30,44 @@ - + - - - - <%-- + + + + <%-- - --%> - + --%> + + + + + + + + + + + + + - - + + - + - + -<%-- + + + + <%-- --%> - + @@ -102,15 +117,19 @@ - + - + +