sap地址切换

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -736,7 +736,11 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 {
                     groutingBatchNoBegin = "l.LASTGROUTINGBATCHNO";
                 }
-
+                OutputLog.TraceLog(LogPriority.Information,
+                                        "",
+                                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                        "【注浆批次】" + groutingBatchNoBegin,
+                                        LocalPath.LogExePath);
                 // TODO 高压自动注浆不验证成型工号
                 /*
                 //校验工号 成型线工号配置的工号 必须包含当前用户
@@ -953,7 +957,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                 OutputLog.TraceLog(LogPriority.Information,
                                         "",
                                         System.Reflection.MethodBase.GetCurrentMethod().Name,
-                                        "【i值变化2】" + i.ToString(),
+                                        "【j值变化】" + j.ToString(),
                                         LocalPath.LogExePath);
                                 //插入注浆记录明细
                                 sqlStr += $@"

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -21665,7 +21665,7 @@ updateuserid=:updateuserid where barcode=:barcode";
         /// <param name="dtData"></param>
         /// <param name="sUserInfo"></param>
         /// <returns></returns>
-        public static ServiceResultEntity SaveFinishedHandover(int orderid, DataTable dtData, SUserInfo sUserInfo)
+        public static ServiceResultEntity SaveFinishedHandover(int orderid, DataTable dtData, SUserInfo sUserInfo, string sapName = "")
         {
             ServiceResultEntity sre = new ServiceResultEntity();
             IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
@@ -22306,7 +22306,10 @@ updateuserid=:updateuserid where barcode=:barcode";
 
                 foreach (Zppfm010 sapParameter010 in sapParameterList)
                 {
-                    ZPPFM010Response result010 = SAPDataLogic.HGSAPDK_ZPPFM010(sapParameter010, yyyymmdd);
+                    //ZPPFM010Response result010 = SAPDataLogic.HGSAPDK_ZPPFM010(sapParameter010, yyyymmdd);
+                    //ZPPFM010Response result010 = SAPDataLogic.HGSAPDK_ZPPFM010_240(sapParameter010, yyyymmdd, sapName);
+                    ZPPFM010Response result010 = SAPDataLogic.HGSAPDK_ZPPFM010(sapParameter010, yyyymmdd, sapName);
+
                     //sre.Message = result010.ZMSG;
                     sre.Message = $"{result010.ZMSG}({sapParameter010.ZSUM})";
                     sre.Result = result010.ZTYPE;
@@ -22430,8 +22433,9 @@ updateuserid=:updateuserid where barcode=:barcode";
                     sapParameter.TABLE_IN = new ZSPP100[sapParameter.ZSUM];
                 }
 
-                ZPPFM008Response result = SAPDataLogic.HGSAPDK_ZPPFM008(sapParameter, yyyymmdd, "60");
-
+                //ZPPFM008Response result = SAPDataLogic.HGSAPDK_ZPPFM008(sapParameter, yyyymmdd, "60");
+                ZPPFM008Response result = SAPDataLogic.HGSAPDK_ZPPFM008(sapParameter, yyyymmdd, "60", sapName);
+                //ZPPFM008Response result = SAPDataLogic.HGSAPDK_ZPPFM008_240(sapParameter, yyyymmdd, "60", sapName);
                 //if (result.Ztype == "E")
                 //{
                 //    sqlString = "update tsap_hegii_datalog t set t.EndTime = sysdate, DataStuts = 'E', DataMSG = DataMSG||:msg where logid = :logid";

DK.Service/SAPDataService/SAPDataLogic.cs

@@ -1907,12 +1907,12 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 		/// </summary>
 		/// <param name="sapParameter"></param>
 		/// <returns></returns>
-		public static ZPPFM008Response HGSAPDK_ZPPFM008(Zppfm008 sapParameter, string yyyymmdd, string datacode)
+		public static ZPPFM008Response HGSAPDK_ZPPFM008(Zppfm008 sapParameter, string yyyymmdd, string datacode, string SPANAME = "")
 		{
 			ZPPFM008Response sapResult = null;
 			try
 			{
-				using (ZPPFM008Client sapClient = new ZPPFM008Client("ZPPFM008_BIND"))
+				using (ZPPFM008Client sapClient = new ZPPFM008Client("ZPPFM008_BIND" + SPANAME))
 				{
 					// 登录
 					UserNamePasswordClientCredential credential =
@@ -1983,12 +1983,12 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 		/// 成品明细(条码接口)
 		/// </summary>
 		/// <param name="user"></param>
-		public static ZPPFM010Response HGSAPDK_ZPPFM010(Zppfm010 sapParameter, string yyyymmdd)
+		public static ZPPFM010Response HGSAPDK_ZPPFM010(Zppfm010 sapParameter, string yyyymmdd, string SPANAME = "")
 		{
 			ZPPFM010Response sapResult = null;
 			try
 			{
-				using (ZPPFM010Client sapClient = new ZPPFM010Client("ZPPFM010_BIND"))
+				using (ZPPFM010Client sapClient = new ZPPFM010Client("ZPPFM010_BIND" + SPANAME))
 				{
 					// 登录
 					UserNamePasswordClientCredential credential =
@@ -2339,12 +2339,12 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 		/// </summary>
 		/// <param name="sapParameter"></param>
 		/// <returns></returns>
-		private static ZPPFM008Response HGSAPDK_ZPPFM008_240(Zppfm008 sapParameter, string yyyymmdd, string datacode)
+		public static ZPPFM008Response HGSAPDK_ZPPFM008_240(Zppfm008 sapParameter, string yyyymmdd, string datacode, string SPANAME = "")
 		{
 			ZPPFM008Response sapResult = null;
 			try
 			{
-				using (ZPPFM008Client sapClient = new ZPPFM008Client("ZPPFM008_BIND_240"))
+				using (ZPPFM008Client sapClient = new ZPPFM008Client("ZPPFM008_BIND_240" + SPANAME))
 				{
 					// 登录
 					UserNamePasswordClientCredential credential =
@@ -2389,12 +2389,12 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 		/// 成品明细(条码接口)-测试
 		/// </summary>
 		/// <param name="user"></param>
-		private static ZPPFM010Response HGSAPDK_ZPPFM010_240(Zppfm010 sapParameter, string yyyymmdd)
+		public static ZPPFM010Response HGSAPDK_ZPPFM010_240(Zppfm010 sapParameter, string yyyymmdd, string SPANAME = "")
 		{
 			ZPPFM010Response sapResult = null;
 			try
 			{
-				using (ZPPFM010Client sapClient = new ZPPFM010Client("ZPPFM010_BIND_240"))
+				using (ZPPFM010Client sapClient = new ZPPFM010Client("ZPPFM010_BIND_240" + SPANAME))
 				{
 					// 登录
 					UserNamePasswordClientCredential credential =

DK.Service/SAPTest/App.config

@@ -319,6 +319,17 @@
         bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND"/>
       <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
+
+
+		<endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
+			bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240_APP1"/>
+		<endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
+		  bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP1"/>
+
+		<endpoint address="http://S4DEVAPP2.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
+			bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240_APP2"/>
+		<endpoint address="http://S4DEVAPP2.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
+		  bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP2"/>
     </client>
   </system.serviceModel>
   <dongke.batchingHosting>

WCF.Service/WCF.Hosting/App.config

@@ -308,18 +308,43 @@
         bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_800"/>
       <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
+		
+	  <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_800_APP1"/>
+      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_800_APP1"/>
+		
+	  <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_800_APP2"/>
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_800_APP2"/>
+		
+	 <endpoint address="http://S4PRDAPP3.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_800_APP3"/>
+      <endpoint address="http://S4PRDAPP3.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_800_APP3"/>
     </client>-->
     <!--HEGII SAP同步 测试 240-->
-    <!--<client>
-      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind" binding="customBinding"
+    <client>
+      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240"/>
-      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind" binding="customBinding"
+      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND_soap12" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_soap12"/>
-      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/240/zppfm008/zppfm008_bind" binding="customBinding"
+      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_240"/>
-      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/240/zppfm008/zppfm008_bind" binding="customBinding"
+      <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
-    </client>-->
+
+		<endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
+			  bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240_APP1"/>
+		<endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
+		  bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP1"/>
+
+		<endpoint address="http://S4DEVAPP2.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/230/zppfm010/zppfm010_bind" binding="customBinding"
+			bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240_APP2"/>
+		<endpoint address="http://S4DEVAPP2.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/230/zppfm008/zppfm008_bind" binding="customBinding"
+		  bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP2"/>
+    </client>
   </system.serviceModel>
   <dongke.batchingHosting>
     <add type="Dongke.IBOSS.PRD.WCF.Services.WCFTestService, WCF.Services" />

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -10539,7 +10539,21 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     {
                         int orderID = Convert.ToInt32(data["OrderID"]);
                         DataTable dt = JsonHelper.FromJson<DataTable>(data["Table"] + "");
-                        ServiceResultEntity sre = PMModuleLogicDAL.SaveFinishedHandover(orderID, dt, sUserInfo);
+
+                        //切换sap地址 by fy 2022年7月5日09:15:23 开始
+                        //ServiceResultEntity sre = PMModuleLogicDAL.SaveFinishedHandover(orderID, dt, sUserInfo);
+                        string sapName = "";
+                        if (data.ContainsKey("SPANAME") && data["SPANAME"] is object &&
+                            (data["SPANAME"].Equals("APP1") || data["SPANAME"].Equals("APP2") || data["SPANAME"].Equals("APP3")))
+                        {
+                            sapName = "_" + data["SPANAME"].ToString();
+                        }
+                        else
+                        {
+                            sapName = "";
+                        }
+                        ServiceResultEntity sre = PMModuleLogicDAL.SaveFinishedHandover(orderID, dt, sUserInfo, sapName);
+                        //结束
 
                         if (Convert.ToInt32(sre.Result) > 0)
                         {

WCF.Service/WCF.WebHosting/Web.config

@@ -177,14 +177,29 @@
     </services>
     <!--HEGII SAP同步 正式 800-->
     <!--<client>
-      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND"/>
-      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND_soap12" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_soap12"/>
-      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND"/>
-      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
+		
+	  <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_APP1"/>
+      <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP1"/>
+		
+	  <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_APP2"/>
+      <endpoint address="http://S4PRDAPP2.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP2"/>
+		
+	  <endpoint address="http://S4PRDAPP3.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_APP3"/>
+      <endpoint address="http://S4PRDAPP3.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_APP3"/>
     </client>-->
     <!--HEGII SAP同步 测试 230-->
     <!--<client>