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

UAS-MES/FunctionCode/Make/Make_LabelCheck.Designer.cs

@@ -198,7 +198,7 @@
             // 
             this.columnHeader3.Text = "时间";
             this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader3.Width = 159;
+            this.columnHeader3.Width = 170;
             // 
             // columnHeader4
             // 
@@ -239,7 +239,7 @@
             this.Text = "标签核对";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -52,7 +52,7 @@ namespace UAS_MES.Make
             //聚焦SN号
             sncode.Focus();
             //打开界面提示用户：请输入SN 
-            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+            OperateResult.AppendText(">>请采集SN\n", Color.Black);
             sql = new LogStringBuilder();
             dh = new DataHelper();
         }
@@ -85,7 +85,7 @@ namespace UAS_MES.Make
                         //SN错误,不存在
                         //请输入SN
                         OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
                         return;
                     }
                     //存在该SN号,查询相关需要核对的信息
@@ -101,7 +101,7 @@ namespace UAS_MES.Make
                     if (checkItemInfo.Rows.Count==0)
                     {
                         OperateResult.AppendText("<<序列号" + sncode.Text + "没有需要核对的项\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
                         return;
                     }
                     //记录SN
@@ -119,60 +119,64 @@ namespace UAS_MES.Make
                     if (needCheckedInfo == sncode.Text)
                     {
                         checkIndex += 1;//序号+1，进入下一步
-                        //输入一致则进入下一个
-                        getNextInfo(checkIndex);
-                        if (checkIndex < checkItemInfo.Rows.Count-1)
+                        if (checkIndex == checkItemInfo.Rows.Count)
                         {
-                            return;
-                        }
-                        //说明输入的核对信息对比一致
-                        //判断工序属性attribute
-                        if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
-                        {
-                            //判断序列号下一工序（CHECKSTEPSNANDMACODE）
-                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                            //说明输入的核对信息对比一致
+                            //判断工序属性attribute
+                            if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                             {
-                                //调用  SETSTEPRESULT ，获取返回的工单号，
-                                if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "标签核对", "OK", User.UserCode, out oErrorMessage))
+                                //判断序列号下一工序（CHECKSTEPSNANDMACODE）
+                                if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                                 {
-                                    //提示正确返回时传递的信息
-                                    if (oErrorMessage.Contains("AFTERSUCCESS"))
-                                        OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                                    //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                                    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);
-                                    //将SN,时间，结果记录在页面
-                                    recordResult(SN, DateTime.Now.ToString(), "成功");
-                                    //记录日志
-                                    LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,ma_code.Text,User.UserLineCode,User.UserSourceCode,"标签核对","标签核对成功",SN,"");
-                                    //IMEI核对成功
-                                    //>> 请输入SN
-                                    OperateResult.AppendText("<<核对成功\n", Color.Green, sncode);
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                    //调用  SETSTEPRESULT ，获取返回的工单号，
+                                    if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "标签核对", "OK", User.UserCode, out oErrorMessage))
+                                    {
+                                        //提示正确返回时传递的信息
+                                        if (oErrorMessage.Contains("AFTERSUCCESS"))
+                                            OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                                        //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                                        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);
+                                        //将SN,时间，结果记录在页面
+                                        recordResult(SN, DateTime.Now.ToString(), "成功");
+                                        //记录日志
+                                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "标签核对成功", SN, "");
+                                        //IMEI核对成功
+                                        //>> 请输入SN
+                                        OperateResult.AppendText("<<核对成功\n", Color.Green, sncode);
+                                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
+                                        checkIndex = 0;
+                                        isCheckItem = false;
+                                    }
+                                    else
+                                    {
+                                        //setstepresult不通过
+                                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                                        recordResult(SN, DateTime.Now.ToString(), "失败");
+                                    }
                                 }
                                 else
                                 {
-                                    //setstepresult不通过
+                                    //判定序列号下一工序不通过
                                     OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                                     recordResult(SN, DateTime.Now.ToString(), "失败");
                                 }
                             }
                             else
                             {
-                                //判定序列号下一工序不通过
+                                //判定工序属性不通过
                                 OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                                 recordResult(SN, DateTime.Now.ToString(), "失败");
                             }
                         }
                         else
                         {
-                            //判定工序属性不通过
-                            OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                            recordResult(SN, DateTime.Now.ToString(), "失败");
+                            //输入一致则进入下一个
+                            getNextInfo(checkIndex);
                         }
                     }
                     //说明比对不一致
@@ -183,10 +187,11 @@ namespace UAS_MES.Make
                         //信息核对失败
                         //>> 请输入SN
                         OperateResult.AppendText(">>上料信息或序列号采集信息"+needCheckedInfo+"核对失败,不一致\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
+                        //imei1校对结束，下次输入的是SN
+                        isCheckItem = false;
+                        checkIndex = 0;
                     }
-                    //imei1校对结束，下次输入的是SN
-                    isCheckItem = false;
                 }
             }
         }
@@ -222,14 +227,14 @@ namespace UAS_MES.Make
                 //从makeserial表中查询对应字段的值
                 needCheckedInfo = dh.getFieldDataByCondition("makeserial","ms_"+ checkItemInfo.Rows[index]["checkitem"].ToString(),"ms_id ='"+ dt.Rows[0]["ms_id"].ToString() + "'").ToString();
                 OperateResult.AppendText("<<序列号" + SN + "对应的"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "为:" + needCheckedInfo + "\n", Color.Green);
-                OperateResult.AppendText(">>请输入"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "\n", Color.Black, sncode);
+                OperateResult.AppendText(">>请采集"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "\n", Color.Black, sncode);
             }
             else//为上料信息
             {
                 //从craftmaterial中查询上料记录
                 needCheckedInfo = dh.getFieldDataByCondition("craftmaterial", "cm_barcode", "cm_makecode='"+ dt.Rows[0]["ms_makecode"].ToString() + "' and cm_sncode in ('"+SN+"'"+(TSN==""?"":(",'"+TSN+"'"))+") and cm_fsoncode='"+checkItemInfo.Rows[index]["fsoncode"].ToString()+"' and cm_status=0").ToString();
                 OperateResult.AppendText("<<序列号" + SN + "上料物料:"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "的条码号为:" + needCheckedInfo + "\n", Color.Green);
-                OperateResult.AppendText(">>请输入物料"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "条码\n", Color.Black, sncode);
+                OperateResult.AppendText(">>请采集物料"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "条码\n", Color.Black, sncode);
             }
         }
     }