整合导航菜单mes支持跳转到web

DK.Client/Client.Controls/Layout/F_MST_012004.cs

@@ -228,8 +228,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 						//}
 						this.ftcLogo.InitValue(layout["LogoNameCode"].ToString(), layout["LogoID"]);
 
-                        //xuwei add 2019-11-20
-                        if(layout["PrintType"].ToString()!="")
+                        //xuwei add 2020-01-03
+                        if(layout["PrintType"] is object)
                             this.ddlPrintType.SelectedValue = layout["PrintType"].ToString();
 					}
 				}

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -16591,7 +16591,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
                 // 釉料变更履历
                 sql = "insert into TP_PM_GlazetypeRecord\n" +
-                "values\n" +
+                //"values\n" + xuwei update 2020-01-02
                 "  (GROUTINGDAILYDETAILID\n" +
                 "  ,OldGlazetypeid\n" +
                 "  ,NewGlazetypeid\n" +
@@ -16657,7 +16657,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
         /// 设置条码商标 釉料
         /// </summary>
         /// <returns></returns>
-        public static int SaveBarCodesLogoAndGlazetype(string[] barcodes, int logoid, int glazetypeid, int procedureID, SUserInfo sUserInfo)
+        public static int SaveBarCodesLogoAndGlazetype(string barcodesstr, int logoid, int glazetypeid, int procedureID, SUserInfo sUserInfo)
         {
             int returnRows = 0;
             IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
@@ -16671,7 +16671,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     "where g.barcode = :barcode";
                 // 釉料变更履历
                 string sql1 = "insert into TP_PM_GlazetypeRecord\n" +
-                "values\n" +
+                //"values\n" + xuwei update 2020-01-02
                 "  (GROUTINGDAILYDETAILID\n" +
                 "  ,OldGlazetypeid\n" +
                 "  ,NewGlazetypeid\n" +
@@ -16689,6 +16689,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 "  ,:CreateUserID)";
                 string sql2 = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
 
+                //xuwei add 2020-01-02
+                string[] barcodes = barcodesstr.Split(',');
+
                 foreach (string barcode in barcodes)
                 {
                     Paras = new OracleParameter[] {

IBOSS.PRD/F_SYS_0202.cs

@@ -14,7 +14,7 @@ using System.Data;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-
+using Curtain.Helpers;
 using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DockPanel;
@@ -79,6 +79,7 @@ namespace Dongke.IBOSS.PRD.Client
 			//this.tvwNavigation.SetMenuDictionart(dicTemp);
 			// 纯树形菜单
 			this.InitNavigationTreeView(dtTemp);
+
 		}
 
 		/// <summary>
@@ -174,17 +175,24 @@ namespace Dongke.IBOSS.PRD.Client
 					{
 						if (((TreeView)sender).SelectedNode != null)
 						{
-                            //xuwei add 2019-11-28 如果定义了url 跳转到url
+                            //xuwei add 2020-01-03 如果定义了url 跳转到url 用于转到webmes
                             if(((TreeView)sender).SelectedNode.Tag is object)
                             {
                                 string tag = ((TreeView)sender).SelectedNode.Tag.ToString();
-                                if(tag!="" & tag!=",,,")
+								string title = ((TreeView)sender).SelectedNode.Text.ToString();
+								if (tag!="" & tag!=",,,")
                                 {
-                                    string[] tagArray = tag.Split(',');
-                                    if (tagArray.Length == 1 && tagArray[0].ToString() != "")
-                                        System.Diagnostics.Process.Start(tagArray[0] + "?sessionkey=" + LogInUserInfo.CurrentUser.SessionKey);
+									//静态配置
+									//string goUrl = "http://192.168.0.237:9000/mes/mesgo.ashx";
+
+									//从配置文件读取
+									string goUrl = "http://" + Utility.ReadIniFile(Constant.INI_SECTION_NET, Constant.INI_KEY_IP, AppDomain.CurrentDomain.BaseDirectory + Constant.INI_FILE_NAME) + ":9000/mes/mesgo.ashx";
+
+									string[] tagArray = tag.Split(',');
+									if (tagArray.Length == 1 && tagArray[0].ToString() != "")
+										System.Diagnostics.Process.Start(goUrl + "?go=" + tagArray[0] + "&title=" + title + "&sessionkey=" + LogInUserInfo.CurrentUser.SessionKey);
                                     if (tagArray.Length == 4 && tagArray[3].ToString() != "")
-                                        System.Diagnostics.Process.Start(tagArray[3] + "?sessionkey=" + LogInUserInfo.CurrentUser.SessionKey);
+                                        System.Diagnostics.Process.Start(goUrl + "?go=" + tagArray[3] + "&title=" + title + "&sessionkey=" + LogInUserInfo.CurrentUser.SessionKey);
                                 }
                             }
                             //xuwei end

WCF.Service/WCF.Contracts/IPDAModule.cs

@@ -1701,7 +1701,7 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
    , RequestFormat = WebMessageFormat.Json)]
         [OperationContract]
         ActionResult SaveBarCodesLogoAndGlazetype(string accountCode, string userCode, string userPassword, string sessionKey,
-            string[] barcodes, int logoid, int glazetypeid, int procedureID);
+            string barcodes, int logoid, int glazetypeid, int procedureID);
 
         [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
 , ResponseFormat = WebMessageFormat.Json

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -6221,7 +6221,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
         }
 
         public ActionResult SaveBarCodesLogoAndGlazetype(string accountCode, string userCode, string userPassword, string sessionKey,
-            string[] barcodes, int logoid, int glazetypeid, int procedureID)
+            string barcodes, int logoid, int glazetypeid, int procedureID)
         {
             ActionResult actionResult = new ActionResult();
             try

WCF.Service/WCF.WebHosting/Config.ini

@@ -14,6 +14,9 @@ WCFIP=127.0.0.1
 WCFPort=1234
 ServerName=Debug
 
+[WEBMESSetting]
+GOURL=http://192.168.0.237:9000/mes/mesgo.ashx
+
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.0.125