From dee8295cf2f62cf73e0e4d64b0372b0505e9516c Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 18 Aug 2023 11:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E8=B7=AF=E7=BA=BF=E6=97=A7?= =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E5=A2=9E=E5=8A=A0=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=92=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HalfMaterialTeamworkController.cs | 25 +- .../Controllers/TeamworkController.cs | 24 +- .../Controllers/UserController.cs | 2 +- FactorySystemApi/FactorySystemApi.csproj | 4 +- .../Properties/Settings.Designer.cs | 22 +- FactorySystemApi/Properties/Settings.settings | 6 +- .../Plm_Formula/OAService.disco | 2 +- .../Web References/Plm_Formula/OAService.wsdl | 95 ++++++- .../Web References/Plm_Formula/Reference.cs | 265 +++++++++++++----- .../Web References/Plm_Formula/Reference.map | 2 +- FactorySystemApi/Web.config | 17 +- FactorySystemBll/TeamworkBll.cs | 2 + 12 files changed, 359 insertions(+), 107 deletions(-) diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs index 2ba1f35..88c5042 100644 --- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs @@ -616,13 +616,19 @@ namespace FactorySystemApi.Controllers ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo; TFS_Formula formula = BaseBll.GetTempModel(teamwork.FFormulaID); OAService oAService = new OAService(); - specifList[0].Code = formula.FTestCode; - specifList[0].Version = formula.FVersionCode; + //specifList[0].Code = formula.FTestCode; + //specifList[0].Version = formula.FVersionCode; specifList[0].SP = formula.FPlmCode; specifList[0].SP_Version = formula.FVersionCode; - RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray()); + InputSpecifications oaParam = new InputSpecifications(); + oaParam.USERNAME = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Username"); + oaParam.PASSWORD = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Password"); ; + + oaParam.Specifications = specifList.ToArray(); + + RestResult restResult = oAService.GetSpecificationsList(oaParam); string bomStr = restResult.data == null ? "[]" : restResult.data.ToString(); ExceptionHelper.AddSystemJournal(Request, specifList[0], restResult,user.FID, "DockGetBomData"); List bomList = JsonConvert.DeserializeObject>(bomStr); @@ -691,14 +697,19 @@ namespace FactorySystemApi.Controllers TFS_Formula formula = BaseBll.GetTempModel(string.Format("FTestCode='{0}'", teamwork.FNewTestCode)); OAService oAService = new OAService(); //specifList[0].Code = teamwork.FPlmCode; - specifList[0].Code = formula.FPlmCode; - specifList[0].Version = formula.FVersionCode; - + //specifList[0].Code = formula.FPlmCode; + //specifList[0].Version = formula.FVersionCode; specifList[0].SP = formula.FPlmCode; specifList[0].SP_Version = formula.FVersionCode; - RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray()); + InputSpecifications oaParam = new InputSpecifications(); + oaParam.USERNAME = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Username"); + oaParam.PASSWORD = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Password"); ; + + oaParam.Specifications = specifList.ToArray(); + + RestResult restResult = oAService.GetSpecificationsList(oaParam); string bomStr = restResult.data == null ? "[]" : restResult.data.ToString(); ExceptionHelper.AddSystemJournal(Request, specifList[0], restResult, userId, "DockGetBomData"); List bomList = JsonConvert.DeserializeObject>(bomStr); diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs index b82020b..1d15768 100644 --- a/FactorySystemApi/Controllers/TeamworkController.cs +++ b/FactorySystemApi/Controllers/TeamworkController.cs @@ -481,14 +481,20 @@ namespace FactorySystemApi.Controllers ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo; TFS_Formula formula = BaseBll.GetTempModel(teamwork.FFormulaID); OAService oAService = new OAService(); - specifList[0].Code = formula.FTestCode; - specifList[0].Version = formula.FVersionCode; + //specifList[0].Code = formula.FTestCode; + //specifList[0].Version = formula.FVersionCode; //修改 specifList[0].SP = formula.FPlmCode; specifList[0].SP_Version = formula.FVersionCode; - RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray()); + InputSpecifications oaParam = new InputSpecifications(); + oaParam.USERNAME = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Username"); + oaParam.PASSWORD = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Password"); ; + + oaParam.Specifications = specifList.ToArray(); + + RestResult restResult = oAService.GetSpecificationsList(oaParam); string bomStr = restResult.data == null ? "[]" : restResult.data.ToString(); ExceptionHelper.AddSystemJournal(Request, specifList[0], restResult,user.FID, "DockGetBomData"); List bomList = JsonConvert.DeserializeObject>(bomStr); @@ -558,14 +564,20 @@ namespace FactorySystemApi.Controllers OAService oAService = new OAService(); //specifList[0].Code = formula.FTestCode; - specifList[0].Code = formula.FPlmCode; - specifList[0].Version = formula.FVersionCode; + //specifList[0].Code = formula.FPlmCode; + //specifList[0].Version = formula.FVersionCode; //修改 specifList[0].SP= formula.FPlmCode; specifList[0].SP_Version= formula.FVersionCode; - RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray()); + InputSpecifications oaParam = new InputSpecifications(); + oaParam.USERNAME = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Username"); + oaParam.PASSWORD = AppSettingsHelper.GetAppSettingVal("Plm_Formula_Password"); ; + + oaParam.Specifications = specifList.ToArray(); + + RestResult restResult = oAService.GetSpecificationsList(oaParam); string bomStr = restResult.data == null ? "[]" : restResult.data.ToString(); ExceptionHelper.AddSystemJournal(Request, specifList[0], restResult, userId, "DockGetBomData"); List bomList = JsonConvert.DeserializeObject>(bomStr); diff --git a/FactorySystemApi/Controllers/UserController.cs b/FactorySystemApi/Controllers/UserController.cs index 9b51fc2..06cdd2d 100644 --- a/FactorySystemApi/Controllers/UserController.cs +++ b/FactorySystemApi/Controllers/UserController.cs @@ -228,7 +228,7 @@ namespace FactorySystemApi.Controllers FID = 4, //FName = "李洪伟", //FUser = "HB1100283", - FName = "oatest2", + FName = "oatest1", FUser = "Hb12345678", FExpireTime = DateTime.Now.AddDays(100).ToString("yyyy-MM-dd HH:mm:ss") }; diff --git a/FactorySystemApi/FactorySystemApi.csproj b/FactorySystemApi/FactorySystemApi.csproj index a9146a0..0c742b2 100644 --- a/FactorySystemApi/FactorySystemApi.csproj +++ b/FactorySystemApi/FactorySystemApi.csproj @@ -423,10 +423,10 @@ Settings FactorySystemApi_Sap_Material1_si_mm100_mcs_senderService - + Dynamic Web References\Plm_Formula\ - https://plm.hbflavor.com/PlmWebService/OAService.asmx + https://plmtest.hbflavor.com/PlmWebService/OAService.asmx diff --git a/FactorySystemApi/Properties/Settings.Designer.cs b/FactorySystemApi/Properties/Settings.Designer.cs index 0c64ff4..e621598 100644 --- a/FactorySystemApi/Properties/Settings.Designer.cs +++ b/FactorySystemApi/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FactorySystemApi.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -33,16 +33,6 @@ namespace FactorySystemApi.Properties { } } - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("https://plm.hbflavor.com/PlmWebService/OAService.asmx")] - public string Plm_Formula { - get { - return ((string)(this["Plm_Formula"])); - } - } - [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&send" + @@ -77,5 +67,15 @@ namespace FactorySystemApi.Properties { return ((string)(this["Sap_Group"])); } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("https://plmtest.hbflavor.com/PlmWebService/OAService.asmx")] + public string Plm_Formula { + get { + return ((string)(this["Plm_Formula"])); + } + } } } diff --git a/FactorySystemApi/Properties/Settings.settings b/FactorySystemApi/Properties/Settings.settings index e687391..b6d5e3f 100644 --- a/FactorySystemApi/Properties/Settings.settings +++ b/FactorySystemApi/Properties/Settings.settings @@ -5,9 +5,6 @@ http://dd.hbflavor.com:28888/PlmMsg/SendPLMMsgInterface.asmx - - https://plm.hbflavor.com/PlmWebService/OAService.asmx - http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=ZMCS_FLAVOR&receiverParty=&receiverService=&interface=si_mm100_mcs_sender&interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm @@ -17,5 +14,8 @@ http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=ZMCS_FLAVOR&receiverParty=&receiverService=&interface=si_pp071_mcs_sender&interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp + + https://plmtest.hbflavor.com/PlmWebService/OAService.asmx + \ No newline at end of file diff --git a/FactorySystemApi/Web References/Plm_Formula/OAService.disco b/FactorySystemApi/Web References/Plm_Formula/OAService.disco index 0cb0a05..85ea460 100644 --- a/FactorySystemApi/Web References/Plm_Formula/OAService.disco +++ b/FactorySystemApi/Web References/Plm_Formula/OAService.disco @@ -1,5 +1,5 @@ - + diff --git a/FactorySystemApi/Web References/Plm_Formula/OAService.wsdl b/FactorySystemApi/Web References/Plm_Formula/OAService.wsdl index cf28cd7..0ad33ed 100644 --- a/FactorySystemApi/Web References/Plm_Formula/OAService.wsdl +++ b/FactorySystemApi/Web References/Plm_Formula/OAService.wsdl @@ -1,5 +1,5 @@ - + @@ -98,8 +98,8 @@ - - + + @@ -185,10 +185,17 @@ - + + + + + + + + @@ -201,6 +208,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -236,6 +267,18 @@ + + + + + + + + + + + + @@ -253,6 +296,14 @@ + + + + + + + + @@ -295,6 +346,24 @@ + + + + + + + + + + + + + + + + + + @@ -337,6 +406,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/FactorySystemApi/Web References/Plm_Formula/Reference.cs b/FactorySystemApi/Web References/Plm_Formula/Reference.cs index 009d4de..1c6aec7 100644 --- a/FactorySystemApi/Web References/Plm_Formula/Reference.cs +++ b/FactorySystemApi/Web References/Plm_Formula/Reference.cs @@ -14,12 +14,12 @@ #pragma warning disable 1591 namespace FactorySystemApi.Plm_Formula { - using System; - using System.Web.Services; using System.Diagnostics; - using System.Web.Services.Protocols; + using System; using System.Xml.Serialization; using System.ComponentModel; + using System.Web.Services.Protocols; + using System.Web.Services; /// @@ -39,6 +39,10 @@ namespace FactorySystemApi.Plm_Formula { private System.Threading.SendOrPostCallback GetSpecificationsListOperationCompleted; + private System.Threading.SendOrPostCallback GetCraftURLOperationCompleted; + + private System.Threading.SendOrPostCallback testOperationCompleted; + private bool useDefaultCredentialsSetExplicitly; /// @@ -98,6 +102,12 @@ namespace FactorySystemApi.Plm_Formula { /// public event GetSpecificationsListCompletedEventHandler GetSpecificationsListCompleted; + /// + public event GetCraftURLCompletedEventHandler GetCraftURLCompleted; + + /// + public event testCompletedEventHandler testCompleted; + /// [System.Web.Services.Protocols.SoapHeaderAttribute("MySoapHeaderValue")] [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateMaterialSpec", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] @@ -192,19 +202,19 @@ namespace FactorySystemApi.Plm_Formula { /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetSpecificationsList", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public RestResult GetSpecificationsList(Specifications[] Specificationinfo) { + public RestResult GetSpecificationsList(InputSpecifications Specificationinfo) { object[] results = this.Invoke("GetSpecificationsList", new object[] { Specificationinfo}); return ((RestResult)(results[0])); } /// - public void GetSpecificationsListAsync(Specifications[] Specificationinfo) { + public void GetSpecificationsListAsync(InputSpecifications Specificationinfo) { this.GetSpecificationsListAsync(Specificationinfo, null); } /// - public void GetSpecificationsListAsync(Specifications[] Specificationinfo, object userState) { + public void GetSpecificationsListAsync(InputSpecifications Specificationinfo, object userState) { if ((this.GetSpecificationsListOperationCompleted == null)) { this.GetSpecificationsListOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSpecificationsListOperationCompleted); } @@ -219,6 +229,62 @@ namespace FactorySystemApi.Plm_Formula { } } + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetCraftURL", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public RestResult GetCraftURL(Specifications[] Specificationinfo) { + object[] results = this.Invoke("GetCraftURL", new object[] { + Specificationinfo}); + return ((RestResult)(results[0])); + } + + /// + public void GetCraftURLAsync(Specifications[] Specificationinfo) { + this.GetCraftURLAsync(Specificationinfo, null); + } + + /// + public void GetCraftURLAsync(Specifications[] Specificationinfo, object userState) { + if ((this.GetCraftURLOperationCompleted == null)) { + this.GetCraftURLOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetCraftURLOperationCompleted); + } + this.InvokeAsync("GetCraftURL", new object[] { + Specificationinfo}, this.GetCraftURLOperationCompleted, userState); + } + + private void OnGetCraftURLOperationCompleted(object arg) { + if ((this.GetCraftURLCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetCraftURLCompleted(this, new GetCraftURLCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/test", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string test() { + object[] results = this.Invoke("test", new object[0]); + return ((string)(results[0])); + } + + /// + public void testAsync() { + this.testAsync(null); + } + + /// + public void testAsync(object userState) { + if ((this.testOperationCompleted == null)) { + this.testOperationCompleted = new System.Threading.SendOrPostCallback(this.OntestOperationCompleted); + } + this.InvokeAsync("test", new object[0], this.testOperationCompleted, userState); + } + + private void OntestOperationCompleted(object arg) { + if ((this.testCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.testCompleted(this, new testCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// public new void CancelAsync(object userState) { base.CancelAsync(userState); @@ -285,6 +351,84 @@ namespace FactorySystemApi.Plm_Formula { } } + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class InputSpecifications { + + private string uSERNAMEField; + + private string pASSWORDField; + + private Specifications[] specificationsField; + + /// + public string USERNAME { + get { + return this.uSERNAMEField; + } + set { + this.uSERNAMEField = value; + } + } + + /// + public string PASSWORD { + get { + return this.pASSWORDField; + } + set { + this.pASSWORDField = value; + } + } + + /// + public Specifications[] Specifications { + get { + return this.specificationsField; + } + set { + this.specificationsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class Specifications { + + private string spField; + + private string sP_VersionField; + + /// + public string SP { + get { + return this.spField; + } + set { + this.spField = value; + } + } + + /// + public string SP_Version { + get { + return this.sP_VersionField; + } + set { + this.sP_VersionField = value; + } + } + } + /// [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")] [System.SerializableAttribute()] @@ -624,63 +768,6 @@ namespace FactorySystemApi.Plm_Formula { } } - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] - public partial class Specifications { - - private string codeField; - - private string versionField; - - public string SP { get; set; } - public string SP_Version { get; set; } - - //public string SP { get - // { - // return this.codeField; - // } - // set - // { - // this.codeField = value; - // } - //} - //public string SP_Version - //{ - // get - // { - // return this.versionField; - // } - // set - // { - // this.versionField = value; - // } - //} - - /// - public string Code { - get { - return this.codeField; - } - set { - this.codeField = value; - } - } - - /// - public string Version { - get { - return this.versionField; - } - set { - this.versionField = value; - } - } - } - /// [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")] [System.SerializableAttribute()] @@ -1666,6 +1753,58 @@ namespace FactorySystemApi.Plm_Formula { } } } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void GetCraftURLCompletedEventHandler(object sender, GetCraftURLCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetCraftURLCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetCraftURLCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public RestResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((RestResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void testCompletedEventHandler(object sender, testCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class testCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal testCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } } #pragma warning restore 1591 \ No newline at end of file diff --git a/FactorySystemApi/Web References/Plm_Formula/Reference.map b/FactorySystemApi/Web References/Plm_Formula/Reference.map index cf88675..cfb6298 100644 --- a/FactorySystemApi/Web References/Plm_Formula/Reference.map +++ b/FactorySystemApi/Web References/Plm_Formula/Reference.map @@ -1,5 +1,5 @@ - + diff --git a/FactorySystemApi/Web.config b/FactorySystemApi/Web.config index 817139d..32b304e 100644 --- a/FactorySystemApi/Web.config +++ b/FactorySystemApi/Web.config @@ -12,11 +12,13 @@ - - + + + + @@ -27,8 +29,8 @@ - - + + @@ -120,10 +122,6 @@ http://dd.hbflavor.com:28888/PlmMsg/SendPLMMsgInterface.asmx - - - http://10.10.132.12/PlmWebService/OAService.asmx - http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=ZMCS_FLAVOR&receiverParty=&receiverService=&interface=si_mm100_mcs_sender&interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm @@ -133,6 +131,9 @@ http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=ZMCS_FLAVOR&receiverParty=&receiverService=&interface=si_pp071_mcs_sender&interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp + + https://plmtest.hbflavor.com/PlmWebService/OAService.asmx + diff --git a/FactorySystemBll/TeamworkBll.cs b/FactorySystemBll/TeamworkBll.cs index 2b2f38a..852c2d9 100644 --- a/FactorySystemBll/TeamworkBll.cs +++ b/FactorySystemBll/TeamworkBll.cs @@ -542,6 +542,8 @@ namespace FactorySystemBll } else { + proSql += string.Format("update TFS_FTeamwork set FViewType=FViewType+',3,4' where FID={0};", teamInfo.FID); + BaseBll.CreateTaskData(teamInfo.FID, userId, "8"); proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.配方视图, "F2", 2); proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新半成品中间品香基, "F4", 2); proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新原料视图, "F4", 2);