diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1ff0c423 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/DataBase/菜单初始化脚本/1-12材料管理（Menu_CLGL）.sql b/DataBase/菜单初始化脚本/1-12材料管理（Menu_CLGL）.sql index 8beb160e..884f98b7 100644 --- a/DataBase/菜单初始化脚本/1-12材料管理（Menu_CLGL）.sql +++ b/DataBase/菜单初始化脚本/1-12材料管理（Menu_CLGL）.sql @@ -3,34 +3,87 @@ --delete from Sys_Menu where MenuType='Menu_CLGL' --go /****材料管理******/ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('64E43C10-ECA5-4C7D-97C9-670E9F05DC01','材料信息','CLGL/Material.aspx',10,'0','Menu_CLGL',0,1,1) +VALUES('C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','设计请购一览表','',10,'0','Menu_CLGL',0,0,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('414F9650-37F8-4B20-A2BB-EBBD4F620E49','货架信息','CLGL/GoodsShelves.aspx',20,'0','Menu_CLGL',0,1,1) +VALUES('484E50BA-B6F2-47E0-BB7C-B1C27965E087','合同清单一览表','CLGL/GoodsShelves.aspx',10,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('4B52E7FF-AA04-489B-B0EE-DC31C5C4F45B','施工单位信息','CLGL/SubUnit.aspx',30,'0','Menu_CLGL',0,1,1) +VALUES('F0F43F1C-0E73-4A7C-AE43-26950D8D93E4','合同清单汇总表','CLGL/GoodsShelves.aspx',20,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('43A118BC-0A81-42F1-B008-829D40CFE625','供应商信息','CLGL/Supplier.aspx',40,'0','Menu_CLGL',0,1,1) +VALUES('55301756-3313-4876-A1C3-2D1246C4B93C','管道材料状态一栏表','CLGL/GoodsShelves.aspx',30,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('3C87C9C0-1C22-48A0-A767-9537347F6A7D','合同量单','CLGL/ContractQuantitySheet.aspx',50,'0','Menu_CLGL',0,1,1) +VALUES('074B06B2-456A-4F7B-8E40-00F379C6E302','管道材料编码统计一览表','CLGL/GoodsShelves.aspx',40,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('94041D2D-ADF5-47CD-8628-11837D32354D','请购单','CLGL/PurchaseRequisition.aspx',60,'0','Menu_CLGL',0,1,1) +VALUES('AF7EA0E4-92A1-4F8D-A5A0-99B0084F7C75','管道供货商概要一览表','CLGL/GoodsShelves.aspx',50,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('0E23EC47-4C05-4783-91C1-1ACFE270C4D4','领料单','CLGL/MaterialRecord.aspx',70,'0','Menu_CLGL',0,1,1) +VALUES('8BBFA90C-1F1C-4587-AA94-BE44C5075CBD','MTO明细信息一览表','CLGL/MTODetail.aspx',60,'C0C5E48B-4C0D-4657-92AB-25DF0FEE372F','Menu_CLGL',0,1,1) GO +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('9F944625-2EA3-46A1-8D18-A882CE88F3A5','现场请购到货及出库一览表','',20,'0','Menu_CLGL',0,0,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('7D4E3B4D-76FE-41FB-B2F2-23A0D252D4E4','现场请购明细一览表','CLGL/GoodsShelves.aspx',10,'9F944625-2EA3-46A1-8D18-A882CE88F3A5','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('31134149-CE94-49FD-A1D9-5A70553FAC61','现场到货明细一览表','CLGL/GoodsShelves.aspx',20,'9F944625-2EA3-46A1-8D18-A882CE88F3A5','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('3C30E38D-0BE9-4295-AF70-73D52F7FC4BC','现场出库明细一览表','CLGL/GoodsShelves.aspx',30,'9F944625-2EA3-46A1-8D18-A882CE88F3A5','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('11E1CDE7-1D04-4F47-9A42-4C1F262995D2','各装置管道材料类型及出库比例表','CLGL/GoodsShelves.aspx',40,'9F944625-2EA3-46A1-8D18-A882CE88F3A5','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('9669E903-C7DD-4E48-8962-B22A7B4972E6','其他','',30,'0','Menu_CLGL',0,0,1) +GO + +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +--VALUES('64E43C10-ECA5-4C7D-97C9-670E9F05DC01','材料信息','CLGL/Material.aspx',10,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +--GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('414F9650-37F8-4B20-A2BB-EBBD4F620E49','货架信息','CLGL/GoodsShelves.aspx',20,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('4B52E7FF-AA04-489B-B0EE-DC31C5C4F45B','施工单位信息','CLGL/SubUnit.aspx',30,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('43A118BC-0A81-42F1-B008-829D40CFE625','供应商信息','CLGL/Supplier.aspx',40,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +GO + +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +--VALUES('3C87C9C0-1C22-48A0-A767-9537347F6A7D','合同量单','CLGL/ContractQuantitySheet.aspx',50,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +--GO + +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +--VALUES('94041D2D-ADF5-47CD-8628-11837D32354D','请购单','CLGL/PurchaseRequisition.aspx',60,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +--GO + +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +--VALUES('0E23EC47-4C05-4783-91C1-1ACFE270C4D4','领料单','CLGL/MaterialRecord.aspx',70,'9669E903-C7DD-4E48-8962-B22A7B4972E6','Menu_CLGL',0,1,1) +--GO + diff --git a/SGGL/BLL/Service References/MCSService/Reference.cs b/SGGL/BLL/Service References/MCSService/Reference.cs index 54c17735..8ddf3e87 100644 --- a/SGGL/BLL/Service References/MCSService/Reference.cs +++ b/SGGL/BLL/Service References/MCSService/Reference.cs @@ -15,6 +15,20 @@ namespace BLL.MCSService { [System.ServiceModel.ServiceContractAttribute(ConfigurationName="MCSService.WebService1Soap")] public interface WebService1Soap { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getLabPoDetails", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string getLabPoDetails(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getLabPoDetails", ReplyAction="*")] + System.Threading.Tasks.Task getLabPoDetailsAsync(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/writeLabIssueDetails", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string writeLabIssueDetails(string JsonVoiceArray, long ProjectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/writeLabIssueDetails", ReplyAction="*")] + System.Threading.Tasks.Task writeLabIssueDetailsAsync(string JsonVoiceArray, long ProjectID); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getVendorUserNameAndPwd", ReplyAction="*")] [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] string getVendorUserNameAndPwd(); @@ -22,6 +36,27 @@ namespace BLL.MCSService { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getVendorUserNameAndPwd", ReplyAction="*")] System.Threading.Tasks.Task getVendorUserNameAndPwdAsync(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPipeMaterilalByType", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string getPipeMaterilalByType(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPipeMaterilalByType", ReplyAction="*")] + System.Threading.Tasks.Task getPipeMaterilalByTypeAsync(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPipeMaterilalByAera", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string getPipeMaterilalByAera(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPipeMaterilalByAera", ReplyAction="*")] + System.Threading.Tasks.Task getPipeMaterilalByAeraAsync(long projectID); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPojectReport", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string getPojectReport(long projectId, string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPojectReport", ReplyAction="*")] + System.Threading.Tasks.Task getPojectReportAsync(long projectId, string name); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPojectInfo", ReplyAction="*")] [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] string getPojectInfo(); @@ -36,6 +71,13 @@ namespace BLL.MCSService { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPoDetails", ReplyAction="*")] System.Threading.Tasks.Task getPoDetailsAsync(long projectID); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPoDetailsByPoNo", ReplyAction="*")] + [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] + string getPoDetailsByPoNo(long projectID, string poNo); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getPoDetailsByPoNo", ReplyAction="*")] + System.Threading.Tasks.Task getPoDetailsByPoNoAsync(long projectID, string poNo); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/writeShelvesNo", ReplyAction="*")] [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)] string writeShelvesNo(string JsonVoiceArray, long ProjectID); @@ -155,6 +197,22 @@ namespace BLL.MCSService { base(binding, remoteAddress) { } + public string getLabPoDetails(long projectID) { + return base.Channel.getLabPoDetails(projectID); + } + + public System.Threading.Tasks.Task getLabPoDetailsAsync(long projectID) { + return base.Channel.getLabPoDetailsAsync(projectID); + } + + public string writeLabIssueDetails(string JsonVoiceArray, long ProjectID) { + return base.Channel.writeLabIssueDetails(JsonVoiceArray, ProjectID); + } + + public System.Threading.Tasks.Task writeLabIssueDetailsAsync(string JsonVoiceArray, long ProjectID) { + return base.Channel.writeLabIssueDetailsAsync(JsonVoiceArray, ProjectID); + } + public string getVendorUserNameAndPwd() { return base.Channel.getVendorUserNameAndPwd(); } @@ -163,6 +221,30 @@ namespace BLL.MCSService { return base.Channel.getVendorUserNameAndPwdAsync(); } + public string getPipeMaterilalByType(long projectID) { + return base.Channel.getPipeMaterilalByType(projectID); + } + + public System.Threading.Tasks.Task getPipeMaterilalByTypeAsync(long projectID) { + return base.Channel.getPipeMaterilalByTypeAsync(projectID); + } + + public string getPipeMaterilalByAera(long projectID) { + return base.Channel.getPipeMaterilalByAera(projectID); + } + + public System.Threading.Tasks.Task getPipeMaterilalByAeraAsync(long projectID) { + return base.Channel.getPipeMaterilalByAeraAsync(projectID); + } + + public string getPojectReport(long projectId, string name) { + return base.Channel.getPojectReport(projectId, name); + } + + public System.Threading.Tasks.Task getPojectReportAsync(long projectId, string name) { + return base.Channel.getPojectReportAsync(projectId, name); + } + public string getPojectInfo() { return base.Channel.getPojectInfo(); } @@ -179,6 +261,14 @@ namespace BLL.MCSService { return base.Channel.getPoDetailsAsync(projectID); } + public string getPoDetailsByPoNo(long projectID, string poNo) { + return base.Channel.getPoDetailsByPoNo(projectID, poNo); + } + + public System.Threading.Tasks.Task getPoDetailsByPoNoAsync(long projectID, string poNo) { + return base.Channel.getPoDetailsByPoNoAsync(projectID, poNo); + } + public string writeShelvesNo(string JsonVoiceArray, long ProjectID) { return base.Channel.writeShelvesNo(JsonVoiceArray, ProjectID); } diff --git a/SGGL/BLL/Service References/MCSService/Reference.svcmap b/SGGL/BLL/Service References/MCSService/Reference.svcmap index d9f4fe71..19b076d4 100644 --- a/SGGL/BLL/Service References/MCSService/Reference.svcmap +++ b/SGGL/BLL/Service References/MCSService/Reference.svcmap @@ -1,5 +1,5 @@ - + false true @@ -19,11 +19,11 @@ - + - - + + diff --git a/SGGL/BLL/Service References/MCSService/WebService1.disco b/SGGL/BLL/Service References/MCSService/WebService1.disco index be1cd3a4..4be4d3bf 100644 --- a/SGGL/BLL/Service References/MCSService/WebService1.disco +++ b/SGGL/BLL/Service References/MCSService/WebService1.disco @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/SGGL/BLL/Service References/MCSService/WebService1.wsdl b/SGGL/BLL/Service References/MCSService/WebService1.wsdl index 891cd04d..b56c2b85 100644 --- a/SGGL/BLL/Service References/MCSService/WebService1.wsdl +++ b/SGGL/BLL/Service References/MCSService/WebService1.wsdl @@ -2,6 +2,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12,6 +41,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +108,21 @@ + + + + + + + + + + + + + + + @@ -224,12 +311,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,6 +359,12 @@ + + + + + + @@ -320,10 +443,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,6 +489,13 @@ + + + + + + + @@ -417,10 +579,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -431,6 +625,13 @@ + + + + + + + @@ -515,10 +716,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -527,6 +748,10 @@ + + + + @@ -581,10 +806,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -593,6 +838,10 @@ + + + + @@ -647,10 +896,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -659,6 +928,10 @@ + + + + @@ -714,6 +987,24 @@ + + + + + + + + + + + + + + + + + + @@ -723,6 +1014,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -741,6 +1059,15 @@ + + + + + + + + + @@ -861,6 +1188,24 @@ + + + + + + + + + + + + + + + + + + @@ -870,6 +1215,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -888,6 +1260,15 @@ + + + + + + + + + @@ -1008,6 +1389,24 @@ + + + + + + + + + + + + + + + + + + @@ -1017,6 +1416,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1035,6 +1461,15 @@ + + + + + + + + + @@ -1155,6 +1590,24 @@ + + + + + + + + + + + + + + + + + + @@ -1164,6 +1617,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1182,6 +1662,15 @@ + + + + + + + + + @@ -1302,16 +1791,16 @@ - + - + - + - + \ No newline at end of file diff --git a/SGGL/BLL/Service References/MCSService/configuration.svcinfo b/SGGL/BLL/Service References/MCSService/configuration.svcinfo index ed8de013..1489f0f0 100644 --- a/SGGL/BLL/Service References/MCSService/configuration.svcinfo +++ b/SGGL/BLL/Service References/MCSService/configuration.svcinfo @@ -2,11 +2,12 @@ - - + + + - - + + \ No newline at end of file diff --git a/SGGL/BLL/Service References/MCSService/configuration91.svcinfo b/SGGL/BLL/Service References/MCSService/configuration91.svcinfo index 353c8b56..463a01bd 100644 --- a/SGGL/BLL/Service References/MCSService/configuration91.svcinfo +++ b/SGGL/BLL/Service References/MCSService/configuration91.svcinfo @@ -1,5 +1,5 @@ - + @@ -72,6 +72,115 @@ System.ServiceModel.Configuration.BasicHttpSecurityElement + + Transport + + + System.ServiceModel.Configuration.HttpTransportSecurityElement + + + None + + + None + + + System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement + + + Never + + + TransportSelected + + + (集合) + + + + + + System.ServiceModel.Configuration.BasicHttpMessageSecurityElement + + + UserName + + + Default + + + + + + + WebService1Soap1 + + + + + + + + + + + + + + + + + + + + + StrongWildcard + + + + + + 65536 + + + + + + + + + System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + System.Text.UTF8Encoding + + + Buffered + + + + + + Text + + + System.ServiceModel.Configuration.BasicHttpSecurityElement + None @@ -160,113 +269,116 @@ System.Text.UTF8Encoding - - System.ServiceModel.Configuration.HttpTransportElement + + System.ServiceModel.Configuration.HttpsTransportElement - + False - + 524288 - + 65536 - + False - + 00:00:00 - + Anonymous - + False - + True - + StrongWildcard - + True - + 65536 - + 0 - + System.ServiceModel.Configuration.HttpMessageHandlerFactoryElement - + (集合) - + - + - + Anonymous - + - + Buffered - + False - + True - + System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - + Never - + TransportSelected - + (集合) - + System.ServiceModel.Configuration.WebSocketTransportSettingsElement - + Never - + False - + 00:00:00 - + - + False - + 0 + + False + - + - http://mat.cwcec.com/LocWebServices/WebService1.asmx + https://mat.cwcec.com/LocWebServices/WebService1.asmx @@ -348,10 +460,10 @@ - + - http://mat.cwcec.com/LocWebServices/WebService1.asmx + https://mat.cwcec.com/LocWebServices/WebService1.asmx diff --git a/SGGL/BLL/WebService/MCSWebService.cs b/SGGL/BLL/WebService/MCSWebService.cs index 24d91422..0e9b3561 100644 --- a/SGGL/BLL/WebService/MCSWebService.cs +++ b/SGGL/BLL/WebService/MCSWebService.cs @@ -78,7 +78,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPojectInfo"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPojectInfo" + ex.Message); } } @@ -124,7 +124,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPoDetails"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPoDetails" + ex.Message); } } @@ -176,7 +176,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getIssueDetails"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getIssueDetails" + ex.Message); } } @@ -215,7 +215,46 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPartNoInfo"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPartNoInfo" + ex.Message); + } + } + + public static void getMTODetailInfo(long projectId) + { + try + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + MCSService.WebService1SoapClient mscsC = new MCSService.WebService1SoapClient(); + var details = mscsC.getPojectReport(projectId, "MTO明细信息一览表"); + if (!string.IsNullOrEmpty(details)) + { + var q = from x in db.CLGL_Material where x.ProjectId == projectId.ToString() select x; + if (q.Count() > 0) + { + db.CLGL_Material.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + JArray arr = JArray.Parse(details); + foreach (var item in arr) + { + Model.CLGL_Material material = new Model.CLGL_Material(); + material.Id = SQLHelper.GetNewID(); + material.ProjectId = projectId.ToString(); + material.MaterialCode = item["材料编码"].ToString(); + material.TagNo = item["位号"].ToString(); + material.MaterialName = item["材料名称"].ToString(); + material.Def = item["规格描述"].ToString(); + material.Unit = item["计量单位"].ToString(); + db.CLGL_Material.InsertOnSubmit(material); + db.SubmitChanges(); + } + } + } + } + catch (Exception ex) + { + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getMTODetailInfo" + ex.Message); } } @@ -251,7 +290,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPartNoInfo"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getPartNoInfo" + ex.Message); } } @@ -287,7 +326,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getSubcontractor"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getSubcontractor" + ex.Message); } } @@ -322,7 +361,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getVendor"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getVendor" + ex.Message); } } @@ -374,7 +413,7 @@ } catch (Exception ex) { - ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getVendor"); + ErrLogInfo.WriteLog(ex, "材料管理接口定时器", "MCSWebService.getVendor" + ex.Message); } } } diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx new file mode 100644 index 00000000..87b92d7d --- /dev/null +++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx @@ -0,0 +1,79 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MTODetail.aspx.cs" Inherits="FineUIPro.Web.CLGL.MTODetail" %> + + + + + +材料信息 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs new file mode 100644 index 00000000..bd7d3dc2 --- /dev/null +++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs @@ -0,0 +1,108 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CLGL +{ + public partial class MTODetail : PageBase + { + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + if (this.CurrUser.UserId == BLL.Const.hfnbdId) + { + this.btnGetAll.Hidden = false; + } + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + } + + /// + /// 获取全部 + /// + /// + /// + protected void btnGetAll_Click(object sender, EventArgs e) + { + BLL.MCSWebService.GetCLData(null, null); + this.BindGrid(); + } + + /// + /// 获取 + /// + /// + /// + protected void btnGet_Click(object sender, EventArgs e) + { + BLL.MCSWebService.getMTODetailInfo(BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)); + this.BindGrid(); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"select * + from dbo.CLGL_Material c + where c.ProjectId=@ProjectId order by c.MaterialCode desc"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId))); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs new file mode 100644 index 00000000..fffcb99b --- /dev/null +++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CLGL { + + + public partial class MTODetail { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// btnGetAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGetAll; + + /// + /// btnGet 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGet; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..24f2fefb 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,120 @@ + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(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.CNCECHSSEService.HSSEService.GetSupervise_SubUnitReportListToSUB() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1014 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:07/19/2022 11:34:53 +出错时间:07/19/2022 11:34:53 + + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(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.CNCECHSSEService.HSSEService.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 879 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:07/19/2022 11:34:53 +出错时间:07/19/2022 11:34:53 + + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(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.CNCECHSSEService.HSSEService.GetCheck_CheckRectifyListToSUB(String unitId) + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 776 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:07/19/2022 11:34:53 +出错时间:07/19/2022 11:34:53 + + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(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.CNCECHSSEService.HSSEService.GetInformation_UrgeReportToSUB(String unitId) + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 719 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:07/19/2022 11:34:53 +出错时间:07/19/2022 11:34:53 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 9ceb6407..7707181d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -250,6 +250,7 @@ + @@ -6031,6 +6032,13 @@ MaterialRecord.aspx + + MTODetail.aspx + ASPXCodeBehind + + + MTODetail.aspx + PurchaseRequisition.aspx ASPXCodeBehind