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

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -221,10 +221,6 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>请输入自定义模板" + paramsInfo.Rows[0]["lp_name"].ToString() + "的值\n", Color.Green);
                 //打开模板路径
                 //doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.SelectedText.Split(':')[1]);
-                if (doc != null)
-                {
-                    doc.Close();
-                }
                 //doc = lbl.Documents.Open(ftpOperater.DownLoadTo + listA.Rows[PrintLabel.SelectedIndex]["pl_labelname"].ToString());
                 currentIndex = 1;
                 //聚焦输入框
@@ -248,10 +244,6 @@ namespace UAS_MES.Make
 
         private void Make_CustomLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (doc!=null)
-            {
-                doc.Close();
-            }
             BaseUtil.ClosePrint(lbl);
         }
 

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -450,6 +450,7 @@ namespace UAS_MES.Make
                         dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode=''", "ms_sncode='" + ms_sncode.Text + "'");
+                        LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "采集不良", User.UserCode);
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集不良", "采集不良成功", ms_sncode.Text, ob_checkno.Text);
                     }
                     string checkno = dt.Rows[0]["ms_checkno"].ToString();

UAS_DLLTest/Form1.cs

@@ -43,7 +43,6 @@ namespace UAS_DLLTest
             //动态的计算方法框的高度
             //显示的控件才需要计数
             int ControlHeight = 0;
-            Console.WriteLine(ShowMethods.Count);
             for (int i = 0; i < ShowMethods.Count; i++)
             {
                 RadioButton btn = new RadioButton();
@@ -57,14 +56,14 @@ namespace UAS_DLLTest
                 btn.Location = new Point((Methods.Width / 6 - btn.Width) / 2 + (i % RowItemCount) * (Methods.Width / RowItemCount), 25 + (i / RowItemCount) * (btn.Height));
                 Methods.Controls.Add(btn);
                 btn.CheckedChanged += new EventHandler(radioButton_checkChanged);
-                if (i==0)
+                if (i == 0)
                 {
                     btn.Checked = true;
                 }
             }
             //是否剩下一行没装满的
             int LastRow = ShowMethods.Count % RowItemCount == 0 ? 0 : 1;
-            Methods.Size = new Size(Methods.Width, ControlHeight * (ShowMethods.Count / RowItemCount + ShowMethods.Count % RowItemCount+2));
+            Methods.Size = new Size(Methods.Width, ControlHeight * (ShowMethods.Count / RowItemCount + ShowMethods.Count % RowItemCount + 2));
             Parameters.Location = new Point(Methods.Location.X, Methods.Location.Y + Methods.Size.Height);
             Result.Location = new Point(Parameters.Location.X, Parameters.Location.Y + Parameters.Size.Height);
             Height = Methods.Height + Parameters.Height + Result.Height + 50;