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

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -576,7 +576,6 @@ namespace UAS_MES.Make
                 SaveBadLocation.Enabled = true;
         }
 
-
         private void mbl_loc_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -644,7 +643,7 @@ namespace UAS_MES.Make
 
         private void ms_prodcode_TextChanged(object sender, EventArgs e)
         {
-            bd_soncode.Condition = "bd_mothercode='" + ms_prodcode.Text + "'";
+            bd_soncode.Condition = "bd_mothercode='" + ms_prodcode.Text + "' and NVL(bd_usestatus,' ')<>'DISABLE'";
         }
     }
 }

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.Designer.cs

@@ -124,7 +124,7 @@
             this.CodeSoft.Checked = true;
             this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CodeSoft.Location = new System.Drawing.Point(1291, 15);
-            this.CodeSoft.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CodeSoft.Margin = new System.Windows.Forms.Padding(4);
             this.CodeSoft.Name = "CodeSoft";
             this.CodeSoft.Size = new System.Drawing.Size(122, 31);
             this.CodeSoft.TabIndex = 161;
@@ -158,7 +158,7 @@
             // 
             this.la_name.Enabled = false;
             this.la_name.Location = new System.Drawing.Point(127, 650);
-            this.la_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.la_name.Margin = new System.Windows.Forms.Padding(4);
             this.la_name.Name = "la_name";
             this.la_name.Size = new System.Drawing.Size(213, 25);
             this.la_name.TabIndex = 201;
@@ -180,17 +180,18 @@
             this.FTPShare.Checked = true;
             this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
             this.FTPShare.Location = new System.Drawing.Point(1067, 602);
-            this.FTPShare.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.FTPShare.Margin = new System.Windows.Forms.Padding(4);
             this.FTPShare.Name = "FTPShare";
             this.FTPShare.Size = new System.Drawing.Size(83, 19);
             this.FTPShare.TabIndex = 200;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
+            this.FTPShare.Visible = false;
             // 
             // OpenFolder
             // 
             this.OpenFolder.Location = new System.Drawing.Point(639, 650);
-            this.OpenFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OpenFolder.Margin = new System.Windows.Forms.Padding(4);
             this.OpenFolder.Name = "OpenFolder";
             this.OpenFolder.Size = new System.Drawing.Size(51, 28);
             this.OpenFolder.TabIndex = 192;
@@ -213,7 +214,7 @@
             // 
             this.FolderPath.Enabled = false;
             this.FolderPath.Location = new System.Drawing.Point(476, 650);
-            this.FolderPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
             this.FolderPath.Name = "FolderPath";
             this.FolderPath.Size = new System.Drawing.Size(155, 25);
             this.FolderPath.TabIndex = 193;
@@ -227,7 +228,7 @@
             this.FolderPath_Label.Name = "FolderPath_Label";
             this.FolderPath_Label.Size = new System.Drawing.Size(92, 27);
             this.FolderPath_Label.TabIndex = 194;
-            this.FolderPath_Label.Text = "模板路径";
+            this.FolderPath_Label.Text = "本地路径";
             // 
             // la_code_label
             // 
@@ -245,7 +246,7 @@
             this.LabelParam.AutoScroll = true;
             this.LabelParam.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.LabelParam.Location = new System.Drawing.Point(1116, 152);
-            this.LabelParam.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.LabelParam.Margin = new System.Windows.Forms.Padding(4);
             this.LabelParam.Name = "LabelParam";
             this.LabelParam.Size = new System.Drawing.Size(343, 432);
             this.LabelParam.TabIndex = 203;
@@ -263,8 +264,8 @@
             // 
             // OpernSaveFolder
             // 
-            this.OpernSaveFolder.Location = new System.Drawing.Point(983, 651);
-            this.OpernSaveFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OpernSaveFolder.Location = new System.Drawing.Point(1067, 649);
+            this.OpernSaveFolder.Margin = new System.Windows.Forms.Padding(4);
             this.OpernSaveFolder.Name = "OpernSaveFolder";
             this.OpernSaveFolder.Size = new System.Drawing.Size(51, 28);
             this.OpernSaveFolder.TabIndex = 209;
@@ -274,10 +275,10 @@
             // 
             // SavePath
             // 
-            this.SavePath.Location = new System.Drawing.Point(820, 651);
-            this.SavePath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SavePath.Location = new System.Drawing.Point(827, 651);
+            this.SavePath.Margin = new System.Windows.Forms.Padding(4);
             this.SavePath.Name = "SavePath";
-            this.SavePath.Size = new System.Drawing.Size(155, 25);
+            this.SavePath.Size = new System.Drawing.Size(213, 25);
             this.SavePath.TabIndex = 210;
             this.SavePath.Text = "\\\\172.16.11.99\\ShareTest";
             // 
@@ -300,7 +301,7 @@
             this.Delete.Image = ((System.Drawing.Image)(resources.GetObject("Delete.Image")));
             this.Delete.IsShowBorder = true;
             this.Delete.Location = new System.Drawing.Point(857, 69);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4);
             this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
             this.Delete.Name = "Delete";
             this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
@@ -318,7 +319,7 @@
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pagination1.DeleteEnable = false;
             this.pagination1.Location = new System.Drawing.Point(0, 690);
-            this.pagination1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.pagination1.Margin = new System.Windows.Forms.Padding(5);
             this.pagination1.Name = "pagination1";
             this.pagination1.Size = new System.Drawing.Size(1469, 40);
             this.pagination1.TabIndex = 207;
@@ -329,7 +330,7 @@
             this.pr_code2.BackColor = System.Drawing.Color.White;
             this.pr_code2.ID = null;
             this.pr_code2.Location = new System.Drawing.Point(137, 18);
-            this.pr_code2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_code2.Margin = new System.Windows.Forms.Padding(4);
             this.pr_code2.Name = "pr_code2";
             this.pr_code2.Power = null;
             this.pr_code2.Size = new System.Drawing.Size(199, 25);
@@ -346,8 +347,8 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(1060, 650);
-            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Save.Location = new System.Drawing.Point(1140, 649);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
@@ -373,7 +374,7 @@
             "SN标签",
             "自定义"});
             this.la_type.Location = new System.Drawing.Point(476, 598);
-            this.la_type.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.la_type.Margin = new System.Windows.Forms.Padding(4);
             this.la_type.Name = "la_type";
             this.la_type.Size = new System.Drawing.Size(213, 23);
             this.la_type.TabIndex = 197;
@@ -386,7 +387,7 @@
             this.la_code.DBTitle = "模板查询";
             this.la_code.FormName = null;
             this.la_code.Location = new System.Drawing.Point(127, 598);
-            this.la_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.la_code.Margin = new System.Windows.Forms.Padding(4);
             this.la_code.Name = "la_code";
             this.la_code.Power = null;
             this.la_code.ReturnData = null;
@@ -401,7 +402,7 @@
             // ChooseAll
             // 
             this.ChooseAll.Location = new System.Drawing.Point(21, 94);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(51, 25);
             this.ChooseAll.TabIndex = 174;
@@ -429,7 +430,7 @@
             this.pl_id,
             this.pl_prodcode});
             this.LabelDataGridView.Location = new System.Drawing.Point(21, 126);
-            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4);
             this.LabelDataGridView.Name = "LabelDataGridView";
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.Size = new System.Drawing.Size(1077, 458);
@@ -555,7 +556,7 @@
             this.pr_code.DBTitle = "产品编号查询";
             this.pr_code.FormName = null;
             this.pr_code.Location = new System.Drawing.Point(827, 598);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.ReturnData = null;
@@ -575,7 +576,7 @@
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
             this.UpdateGrid.IsShowBorder = true;
             this.UpdateGrid.Location = new System.Drawing.Point(728, 69);
-            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4);
             this.UpdateGrid.MoveImage = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.MoveImage")));
             this.UpdateGrid.Name = "UpdateGrid";
             this.UpdateGrid.NormalImage = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.NormalImage")));
@@ -595,7 +596,7 @@
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
             this.Screen.Location = new System.Drawing.Point(596, 69);
-            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
@@ -613,7 +614,7 @@
             this.pr_spec.BackColor = System.Drawing.Color.White;
             this.pr_spec.ID = null;
             this.pr_spec.Location = new System.Drawing.Point(900, 15);
-            this.pr_spec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_spec.Margin = new System.Windows.Forms.Padding(4);
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.Power = null;
             this.pr_spec.Size = new System.Drawing.Size(199, 25);
@@ -629,7 +630,7 @@
             this.pr_detail.BackColor = System.Drawing.Color.White;
             this.pr_detail.ID = null;
             this.pr_detail.Location = new System.Drawing.Point(497, 16);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.Size = new System.Drawing.Size(199, 25);
@@ -683,7 +684,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.pr_detail_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "SystemSetting_LabelMaintain";
             this.Tag = "Make!ProLabel";
             this.Text = "产品标签维护";

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -394,19 +394,19 @@ namespace UAS_MES.SystemSetting
         //判断与标签保存时是否已经有同类型标签存在
         private Boolean isSameLabel(string pl_prodcode, string pl_labeltype, string pl_labelname,string pl_labelcode)
         {
-            LogStringBuilder sql2 = new LogStringBuilder();
-            sql2.Append("select la_id,pl_labelname,pl_labelurl,pl_labeltype,pl_isdefault,pl_prodcode,pl_id,pl_labelcode,pl_detno,pl_labelsoft,pr_detail,pr_spec,");
-            sql2.Append("pr_code from productlabel left join product on pl_prodcode=pr_code left join label on pl_labelcode=la_code");
-            sql2.Append(" where  pl_prodcode = '" + pl_prodcode + "'  and pl_labeltype = '" + pl_labeltype + "'  and pl_labelname = '" + pl_labelname + "' and pl_labelcode = '"+ pl_labelcode + "'");
-            dt = (DataTable)dh.ExecuteSql(sql2.GetString(), "select");
+            sql.Clear();
+            sql.Append("select la_id,pl_labelname,pl_labelurl,pl_labeltype,pl_isdefault,pl_prodcode,pl_id,pl_labelcode,pl_detno,pl_labelsoft,pr_detail,pr_spec,");
+            sql.Append("pr_code from productlabel left join product on pl_prodcode=pr_code left join label on pl_labelcode=la_code");
+            sql.Append(" where  pl_prodcode = '" + pl_prodcode + "'  and pl_labeltype = '" + pl_labeltype + "'  and pl_labelname = '" + pl_labelname + "' and pl_labelcode = '"+ pl_labelcode + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
-                sql2.Clear();
+                sql.Clear();
                 return true;
             }
             else
             {
-                sql2.Clear();
+                sql.Clear();
                 return false;
             }
         }
@@ -414,7 +414,6 @@ namespace UAS_MES.SystemSetting
 
         private void LoadData()
         {
-
             //如果没有任何筛选条件直接选取productlabel的数据
             if (sql.GetString().Length == 0)
             {

UAS_MesInterface/MESHelper.cs

@@ -25,12 +25,11 @@ namespace BenQGuru.eMES.DLLService
         bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iMPKind, string iResult, string iErrCode, string flag, out string oErrorMessage);
         bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage);
         bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage);
-        string Test(string TEST);
     }
 
     [Guid("41EAB546-6EF4-464A-895A-9C34013A5D8C")]
     [ComSourceInterfaces(typeof(IMESHelper))]
-    [ClassInterface(ClassInterfaceType.AutoDispatch)]
+    [ClassInterface(ClassInterfaceType.None)]
     [ProgId("DllService.MESHelper")]
     public class MESHelper : IMESHelper
     {
@@ -496,7 +495,6 @@ namespace BenQGuru.eMES.DLLService
             oErrorMessage = "";
             if (iTSN == "") { oErrorMessage = "TSN不能为空"; return false; }
             if (iSN == "") { oErrorMessage = "SN不能为空"; return false; }
-            if (iSourceCode == "") { oErrorMessage = "岗位资源不能为空"; return false; }
             string[] param = new string[] { iTSN, iSN, iSourceCode, "", iResult, iErrCode, oErrorMessage };
             string[] ParamName = new string[] { "v_i_tsn", "v_i_sncode", "v_i_sourcecode", "v_i_usercode", "v_i_result", "v_i_errcode", "v_o_errmsg" };
             CallProcedure("CS_DLLSNCHANGE", ParamName, ref param);
@@ -1028,10 +1026,5 @@ namespace BenQGuru.eMES.DLLService
                 cmd.Connection.Open();
             }
         }
-
-        public string Test(string TEST)
-        {
-            return TEST;
-        }
     }
 }