123

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -22047,7 +22047,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 //"                      ,'' zscs\n" +
                 //"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
                 "                      ,bar.testmouldflag" +
-                "                      ,decode(bar.testmouldflag,'0', g.goods_line_code, g.goods_line_code || 'S') as zscs\n" +
+                "                      ,decode(bar.testmouldflag,'0', g.goods_line_code, decode(g.goods_line_code,'G','A','M','A','L','B',g.goods_line_code)) as zscs\n" +
                 "                      ,CASE\n" +
                 "                           WHEN o.orderid IS NULL\n" +
                 "                                OR o.orderno LIKE 'HEGII%' THEN\n" +

DK.Service/SAPDataService/SAPDataLogic.cs

@@ -1960,14 +1960,16 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 			{
 				sapResult = new ZPPFM008Response();
 				sapResult.ZTYPE = "E";
-				if (ex is System.ServiceModel.FaultException)
-				{
-					sapResult.ZMSG = ex.Message;
-				}
-				else
-				{
-					sapResult.ZMSG = "DKMES-ERROR:" + Guid.NewGuid();
-				}
+				sapResult.ZMSG = ex.Message;
+
+				//if (ex is System.ServiceModel.FaultException)
+				//{
+				//	sapResult.ZMSG = ex.Message;
+				//}
+				//else
+				//{
+				//	sapResult.ZMSG = "DKMES-ERROR:" + Guid.NewGuid();
+				//}
 				OutputLog.TraceLog(LogPriority.Error,
 						"HGSAPDK_ZPPFM008",
 						sapResult.ZMSG,
@@ -1991,11 +1993,11 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 					// 登录
 					UserNamePasswordClientCredential credential =
 						sapClient.ClientCredentials.UserName;
-                    credential.UserName = "hgsapdk";
-                    credential.Password = "Sapdk#240";
-                    //INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
-                    //credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
-                    //credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
+                    //credential.UserName = "hgsapdk";
+                    //credential.Password = "Sapdk#240";
+                    INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
+                    credential.UserName = ini.ReadIniData("SAP_HEGII", "UserName");
+                    credential.Password = ini.ReadIniData("SAP_HEGII", "Password");
                     // 参数
                     sapParameter.ZSUMSpecified = true;
 					sapParameter.TABLE_OUT = new ZSPP110[0];
@@ -2035,14 +2037,16 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 			{
 				sapResult = new ZPPFM010Response();
 				sapResult.ZTYPE = "E";
-				if (ex is System.ServiceModel.FaultException)
-				{
-					sapResult.ZMSG = ex.Message;
-				}
-				else
-				{
-					sapResult.ZMSG = "DKMES-ERROR:" + Guid.NewGuid();
-				}
+				sapResult.ZMSG = ex.Message;
+
+				//if (ex is System.ServiceModel.FaultException)
+				//{
+				//	sapResult.ZMSG = ex.Message;
+				//}
+				//else
+				//{
+				//	sapResult.ZMSG = "DKMES-ERROR:" + Guid.NewGuid();
+				//}
 				OutputLog.TraceLog(LogPriority.Error,
 						"HGSAPDK_ZPPFM010",
 						sapResult.ZMSG,

DK.Service/SAPDataService/app.config

@@ -28,16 +28,16 @@
             </customBinding>
         </bindings>
         <client>
-            <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind"
+            <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" />
-            <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind"
+            <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"
+            <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" />
-            <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/240/zppfm008/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" />
         </client>

DK.Service/SAPTest/App.config

@@ -311,13 +311,13 @@
     </client>-->
     <!--HEGII SAP同步 测试 240-->
     <client>
-      <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" 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"/>
-      <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>
   </system.serviceModel>

WCF.Service/WCF.Hosting/Config.ini

@@ -11,11 +11,17 @@ Description=
 #DBUser=hegiimes
 #DBPassword=etLHPkLTOLw=
 
-DBIP=172.18.32.116
+#DBIP=172.18.32.116
+#DBPort=1521
+#SID=dkmes
+#DBUser=hgiboss
+#DBPassword=etLHPkLTOLw=
+
+DBIP=172.18.32.30
 DBPort=1521
-SID=dkmes
+SID=hgmestest
 DBUser=hgiboss
-DBPassword=etLHPkLTOLw=
+DBPassword=SWrxDk8Q8eU=
 
 [DBSettingReport]
 DBIP=172.18.32.35

WCF.Service/WCF.WebHosting/Config.ini

@@ -3,11 +3,11 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=172.18.32.35
+DBIP=172.18.32.30
 DBPort=1521
-SID=hgtest
-DBUser=hgtest
-DBPassword=etLHPkLTOLw=
+SID=hgmestest
+DBUser=hgiboss
+DBPassword=SWrxDk8Q8eU=
 
 [DBSettingReport]
 DBIP=172.18.32.35
@@ -46,8 +46,8 @@ LogControl=true
 LogFileName=ScannerLog
 
 [SAP_HEGII]
-Interval=
-NextDate=
+Interval=60000
+NextDate=2022-06-15
 ByTime=07:30
 NextDate6002=
 UserName=hgsapdk