三码核对新界面

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabelNEW.Designer.cs

@@ -47,11 +47,11 @@
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.snCollectionBox1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.sn1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.label6 = new System.Windows.Forms.Label();
-            this.snCollectionBox2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.sn2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.label7 = new System.Windows.Forms.Label();
-            this.snCollectionBox3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.sn3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.label8 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
@@ -247,20 +247,20 @@
             this.OperateResult.TabIndex = 27;
             this.OperateResult.Text = "";
             // 
-            // snCollectionBox1
-            // 
-            this.snCollectionBox1.AllPower = null;
-            this.snCollectionBox1.BackColor = System.Drawing.Color.White;
-            this.snCollectionBox1.ID = null;
-            this.snCollectionBox1.Location = new System.Drawing.Point(135, 408);
-            this.snCollectionBox1.Margin = new System.Windows.Forms.Padding(4);
-            this.snCollectionBox1.Name = "snCollectionBox1";
-            this.snCollectionBox1.Power = null;
-            this.snCollectionBox1.Size = new System.Drawing.Size(334, 35);
-            this.snCollectionBox1.Str = null;
-            this.snCollectionBox1.Str1 = null;
-            this.snCollectionBox1.Str2 = null;
-            this.snCollectionBox1.TabIndex = 34;
+            // sn1
+            // 
+            this.sn1.AllPower = null;
+            this.sn1.BackColor = System.Drawing.Color.White;
+            this.sn1.ID = null;
+            this.sn1.Location = new System.Drawing.Point(135, 408);
+            this.sn1.Margin = new System.Windows.Forms.Padding(4);
+            this.sn1.Name = "sn1";
+            this.sn1.Power = null;
+            this.sn1.Size = new System.Drawing.Size(334, 35);
+            this.sn1.Str = null;
+            this.sn1.Str1 = null;
+            this.sn1.Str2 = null;
+            this.sn1.TabIndex = 34;
             // 
             // label6
             // 
@@ -273,20 +273,20 @@
             this.label6.TabIndex = 33;
             this.label6.Text = "SN";
             // 
-            // snCollectionBox2
-            // 
-            this.snCollectionBox2.AllPower = null;
-            this.snCollectionBox2.BackColor = System.Drawing.Color.White;
-            this.snCollectionBox2.ID = null;
-            this.snCollectionBox2.Location = new System.Drawing.Point(135, 504);
-            this.snCollectionBox2.Margin = new System.Windows.Forms.Padding(4);
-            this.snCollectionBox2.Name = "snCollectionBox2";
-            this.snCollectionBox2.Power = null;
-            this.snCollectionBox2.Size = new System.Drawing.Size(334, 35);
-            this.snCollectionBox2.Str = null;
-            this.snCollectionBox2.Str1 = null;
-            this.snCollectionBox2.Str2 = null;
-            this.snCollectionBox2.TabIndex = 36;
+            // sn2
+            // 
+            this.sn2.AllPower = null;
+            this.sn2.BackColor = System.Drawing.Color.White;
+            this.sn2.ID = null;
+            this.sn2.Location = new System.Drawing.Point(135, 504);
+            this.sn2.Margin = new System.Windows.Forms.Padding(4);
+            this.sn2.Name = "sn2";
+            this.sn2.Power = null;
+            this.sn2.Size = new System.Drawing.Size(334, 35);
+            this.sn2.Str = null;
+            this.sn2.Str1 = null;
+            this.sn2.Str2 = null;
+            this.sn2.TabIndex = 36;
             // 
             // label7
             // 
@@ -299,20 +299,20 @@
             this.label7.TabIndex = 35;
             this.label7.Text = "SN2";
             // 
-            // snCollectionBox3
-            // 
-            this.snCollectionBox3.AllPower = null;
-            this.snCollectionBox3.BackColor = System.Drawing.Color.White;
-            this.snCollectionBox3.ID = null;
-            this.snCollectionBox3.Location = new System.Drawing.Point(135, 614);
-            this.snCollectionBox3.Margin = new System.Windows.Forms.Padding(4);
-            this.snCollectionBox3.Name = "snCollectionBox3";
-            this.snCollectionBox3.Power = null;
-            this.snCollectionBox3.Size = new System.Drawing.Size(334, 35);
-            this.snCollectionBox3.Str = null;
-            this.snCollectionBox3.Str1 = null;
-            this.snCollectionBox3.Str2 = null;
-            this.snCollectionBox3.TabIndex = 38;
+            // sn3
+            // 
+            this.sn3.AllPower = null;
+            this.sn3.BackColor = System.Drawing.Color.White;
+            this.sn3.ID = null;
+            this.sn3.Location = new System.Drawing.Point(135, 614);
+            this.sn3.Margin = new System.Windows.Forms.Padding(4);
+            this.sn3.Name = "sn3";
+            this.sn3.Power = null;
+            this.sn3.Size = new System.Drawing.Size(334, 35);
+            this.sn3.Str = null;
+            this.sn3.Str1 = null;
+            this.sn3.Str2 = null;
+            this.sn3.TabIndex = 38;
             // 
             // label8
             // 
@@ -330,11 +330,11 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1772, 866);
-            this.Controls.Add(this.snCollectionBox3);
+            this.Controls.Add(this.sn3);
             this.Controls.Add(this.label8);
-            this.Controls.Add(this.snCollectionBox2);
+            this.Controls.Add(this.sn2);
             this.Controls.Add(this.label7);
-            this.Controls.Add(this.snCollectionBox1);
+            this.Controls.Add(this.sn1);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_detail);
@@ -382,11 +382,11 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox snCollectionBox1;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sn1;
         private System.Windows.Forms.Label label6;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox snCollectionBox2;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sn2;
         private System.Windows.Forms.Label label7;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox snCollectionBox3;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sn3;
         private System.Windows.Forms.Label label8;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabelNEW.cs

@@ -29,10 +29,6 @@ namespace UAS_MES_NEW.Make
 
         string imei2 = "";
 
-        bool isImei1 = false;
-
-        bool isImei2 = false;
-
         string oErrorMessage = "";
 
         string SN = "";
@@ -81,23 +77,32 @@ namespace UAS_MES_NEW.Make
                 {
                     sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
                 }
-                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
-                {
-                    sql.Clear();
-                    sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
-                    sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-                    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    BaseUtil.SetFormValue(Controls, dt);
-                }
-                //else
-                //{
-                //    OperateResult.AppendText("<<" + oErrorMessage + "\n", Color.Red, sncode);
-                //    return;
-                //}
-                //输入的是SN
-                if (!isImei1 && !isImei2)
+                if (sn1.Text == "")
                 {
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                    {
+                        string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
+                        if (nextstepcode != User.CurrentStepCode)
+                        {
+                            string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
+                            OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
+                            imei1 = "";
+                            imei2 = "";
+                            checksn = "";
+                            return;
+                        }
+                        sql.Clear();
+                        sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+                        sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+                        sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        BaseUtil.SetFormValue(Controls, dt);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                        return;
+                    }
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     sql.Clear();
                     sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "' or ms_code='" + sncode.Text + "' ");
@@ -119,9 +124,10 @@ namespace UAS_MES_NEW.Make
                         SN = sncode.Text;
                         //>> 请输入彩盒上的SN
                         OperateResult.AppendText("<<条码" + sncode.Text + "对应的SN号为:" + checksn + "\n", Color.Green);
+                        sn1.Text = checksn;
                         OperateResult.AppendText(">>请输入需要核对的条码1\n", Color.Black, sncode);
+                        sn1.Text = checksn;
                         //设定要输入imei1
-                        isImei1 = true;
                     }
                     else
                     {
@@ -131,24 +137,19 @@ namespace UAS_MES_NEW.Make
                         BaseUtil.SetFormCenter(set);
                         set.ShowDialog();
                     }
-                }
-                else if (isImei1)
+                }else  if (sn1.Text != "" && sn2.Text == "")
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     imei1 = sncode.Text;
                     if (imei1.Contains(checksn))
                     {
+                        sn2.Text = sncode.Text;
                         OperateResult.AppendText("<<条码1核对成功\n", Color.Green, sncode);
                         OperateResult.AppendText(">>请输入需要核对的条码2\n", Color.Black);
-                        isImei2 = true;
-                        isImei1 = false;
                     }
                     else
                     {
                         //清空imei1变量的值
-                        imei1 = "";
-                        imei2 = "";
-                        checksn = "";
                         //SN核对失败
                         //>> 请输入SN
                         OperateResult.AppendText(">>SN核对失败,不一致" + sncode.Text + "\n", Color.Red, sncode);
@@ -156,12 +157,9 @@ namespace UAS_MES_NEW.Make
                         BaseUtil.SetFormCenter(set);
                         set.ShowDialog();
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        isImei1 = false;
-                        isImei2 = false;
                     }
                 }
-                //输入的是imei1
-                else
+                else if (sn1.Text != "" && sn2.Text != "")
                 {
                     sql.Clear();
                     sql.Append("select ZD_SN from  ZTEDATA  where ZD_DEV_EN_NO='" + sncode.Text + "' and zd_makecode='" + ma_code.Text + "' order by zd_id desc");
@@ -178,24 +176,8 @@ namespace UAS_MES_NEW.Make
                         if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                         {
                             //判断序列号下一工序（CHECKSTEPSNANDMACODE）   
-                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
-                            {
-                                string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
-                                if (nextstepcode != User.CurrentStepCode)
-                                {
-                                    string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
-                                    OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
-                                    imei1 = "";
-                                    imei2 = "";
-                                    checksn = "";
-                                    isImei1 = false;
-                                    isImei2 = false;
-                                    return;
-                                }
-                                //调用  SETSTEPRESULT ，获取返回的工单号，
                                 if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "标签核对", "OK", User.UserCode, out oErrorMessage))
                                 {
-
                                     //提示正确返回时传递的信息
                                     if (oErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + oErrorMessage + "\n");
@@ -206,6 +188,10 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
                                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                     BaseUtil.SetFormValue(Controls, dt);
+                                    sn3.Text = sncode.Text;
+                                    sn1.Text = "";
+                                    sn2.Text = "";
+                                    sn3.Text = "";
                                     //将SN,时间，结果记录在页面
                                     recordResult(checksn, DateTime.Now.ToString(), "成功");
                                     //记录日志
@@ -224,16 +210,7 @@ namespace UAS_MES_NEW.Make
                                     BaseUtil.SetFormCenter(set);
                                     set.ShowDialog();
                                 }
-                            }
-                            else
-                            {
-                                //判定序列号下一工序不通过
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                                recordResult(checksn, DateTime.Now.ToString(), "失败");
-                                SetCheck set = new SetCheck("NG", Color.Red);
-                                BaseUtil.SetFormCenter(set);
-                                set.ShowDialog();
-                            }
+                         
                         }
                         else
                         {
@@ -249,9 +226,6 @@ namespace UAS_MES_NEW.Make
                     else
                     {
                         //清空imei1变量的值
-                        imei1 = "";
-                        imei2 = "";
-                        checksn = "";
                         //SN核对失败
                         //>> 请输入SN
                         OperateResult.AppendText(">>SN核对失败,不一致" + sncode.Text + "\n", Color.Red, sncode);
@@ -261,8 +235,6 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //imei1校对结束，下次输入的是SN
-                    isImei1 = false;
-                    isImei2 = false;
                 }
             }
         }
@@ -276,15 +248,5 @@ namespace UAS_MES_NEW.Make
             //添加结果的信息进去
             showResult.Items.Add(lvi);
         }
-        private void clear()
-        {
-            //清空变量的值
-            omakeCode = "";
-            oMsid = "";
-            SN = "";
-            imei1 = "";
-            imei2 = "";
-            checksn = "";
-        }
     }
 }

UAS_MES_HYSX/UAS_MES_HYSX.csproj

@@ -755,12 +755,6 @@
     <Compile Include="FunctionCode\Make\Make_SmtTestCollection.Designer.cs">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TcpClient.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TcpClient.Designer.cs">
-      <DependentUpon>Make_TcpClient.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Make\Make_StencilPrint.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -773,6 +767,12 @@
     <Compile Include="FunctionCode\Make\Make_StencilScrapReason.Designer.cs">
       <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_TcpClient.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_TcpClient.Designer.cs">
+      <DependentUpon>Make_TcpClient.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_TestCollectionOnlyBad.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1803,15 +1803,15 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TcpClient.resx">
-      <DependentUpon>Make_TcpClient.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_StencilPrint.resx">
       <DependentUpon>Make_StencilPrint.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_StencilScrapReason.resx">
       <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_TcpClient.resx">
+      <DependentUpon>Make_TcpClient.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_TestCollectionOnlyBad.resx">
       <DependentUpon>Make_TestCollectionOnlyBad.cs</DependentUpon>
     </EmbeddedResource>