Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -103,16 +103,19 @@ namespace UAS_MES.Make
                             {
                                 //将工单的其他信息赋值到对应的控件
                                 BaseUtil.SetFormValue(this.Controls, mapB);
-                                if (pr_change)
-                                {
-                                    pr_change = false;
-                                    OperateResult.AppendText(">>产品编号改变，请重新选择标签模板\n", Color.Green);
-                                    return;
-                                }
                                 //提示用户“<<工单号：取ma_makecode”
                                 OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                                 //提示用户“<< 序列号：XXXX”
                                 OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
+                                if (pr_change)
+                                {
+                                    pr_change = false;
+                                    if (MessageBox.Show("是否使用默认标签", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+                                    {
+                                        OperateResult.AppendText(">>产品编号改变，请重新选择标签模板\n", Color.Green);
+                                        return;
+                                    }
+                                }
                             }
                             //没有数据
                             else

UAS-MES/Properties/Settings.Designer.cs

@@ -109,7 +109,7 @@ namespace UAS_MES.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://192.168.253.9/MESSetting/print/|mesconfig|Administrator1@#")]
+        [global::System.Configuration.DefaultSettingValueAttribute("ftp://172.16.11.99/print/|uasmes|Administrator1@#")]
         public string FTPAddress {
             get {
                 return ((string)(this["FTPAddress"]));

UAS-MES/Properties/Settings.settings

@@ -24,7 +24,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ftp://192.168.253.9/MESSetting/print/|mesconfig|Administrator1@#</Value>
+      <Value Profile="(Default)">ftp://172.16.11.99/print/|uasmes|Administrator1@#</Value>
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>