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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -54,6 +54,8 @@ namespace UAS_MES.Make
 
         string macOrBt = "";//存储去掉":"或者"-"的mac和bt
 
+        bool onlyPass = false;
+
         string imeif = "";
 
         bool hasSnList = false;//记录是否有转换后SN清单
@@ -199,6 +201,7 @@ namespace UAS_MES.Make
                                         show_sncode.Text = TSN;
                                         OperateResult.AppendText(">>请输入SN\n", Color.Green, code);
                                         ChangeResult.Enabled = false;
+                                        onlyPass = true;
                                     }
                                     else
                                     {
@@ -243,8 +246,9 @@ namespace UAS_MES.Make
                                 }
                             }
                             //开始录入SN
-                            if ((ChangeResult.Checked && dh.CheckExist("makeserial", " ms_id='" + oMsid + "' and  ms_sncode='" + code.Text + "'")) || !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'") || (!ChangeResult.Checked && (TSN == code.Text)))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "'") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+"'")))
                             {
+                                onlyPass = false;
                                 //SN校验成功，合法,记录下SN
                                 SN = code.Text;
                                 code.Text = "";
@@ -261,7 +265,14 @@ namespace UAS_MES.Make
                             }
                             else
                             {
-                                OperateResult.AppendText("<<序列号" + code.Text + "已存在或无该转换后序列号\n", Color.Red);
+                                if (onlyPass)
+                                {
+                                    OperateResult.AppendText("<<SN号" + code.Text + "错误,已完成转号只允许SN转SN\n", Color.Red);
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText("<<SN号" + code.Text + "已存在\n", Color.Red);
+                                }
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black, code);
                             }
                         }
@@ -487,7 +498,7 @@ namespace UAS_MES.Make
                 //通过存储过程二次校验
                 if (LogicHandler.snChangeAndBurn(TSN,SN,User.UserSourceCode,User.UserCode,ms_macode.Text,ChangeResult.Checked?1:0,(hs.ContainsKey("IMEI1")?hs["IMEI1"].ToString():""), (hs.ContainsKey("IMEI2") ? hs["IMEI2"].ToString() : ""), (hs.ContainsKey("IMEI3") ? hs["IMEI3"].ToString() : ""),"", (hs.ContainsKey("NETCODE") ? hs["NETCODE"].ToString() : ""),"","","","", (hs.ContainsKey("MAC") ? hs["MAC"].ToString() : ""), (hs.ContainsKey("BT") ? hs["BT"].ToString() : ""),"","","",out errorMessage))
                 {
-                    OperateResult.AppendText("<<序列号转换成功\n<<关联采集成功\n", Color.Green);
+                    OperateResult.AppendText("<<序列号"+TSN+"成功转换为"+SN+"\n<<关联采集成功\n", Color.Green);
                     //写入日志
                     LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                     //记录日志
@@ -616,6 +627,7 @@ namespace UAS_MES.Make
             logsql.Clear();
             show_sncode.Text = "";
             ChangeResult.Enabled = true;
+            onlyPass = false;
         }
 
         private void cancel_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -33,6 +33,7 @@ namespace UAS_MES.Make
 
         string oMsId = "";
 
+        bool onlyPass = false;
         bool hasSnList = false;//记录是否有转换后SN清单
 
         bool hasMakeRule = false;//记录是否有工单防呆规则
@@ -163,6 +164,7 @@ namespace UAS_MES.Make
                                             show_sncode.Text = bsncode;
                                             OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
                                             ChangeResult.Enabled = false;
+                                            onlyPass = true;
                                         }
                                         else
                                         {
@@ -206,8 +208,9 @@ namespace UAS_MES.Make
                                     return;
                             }
                             //防呆验证完成
-                            if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_id='" + oMsId + "' and ms_sncode='" + sncode.Text + "'")) || !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'") || (!ChangeResult.Checked && (bsncode == sncode.Text)))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'")))
                             {
+                                onlyPass = false;
                                 string firstsn = "";
                                 string updateSql = "";
                                 //勾选了修改转换结果
@@ -230,7 +233,7 @@ namespace UAS_MES.Make
                                 }
                                 string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
                                 dh.ExecuteSQLTran(updateSql, insertSql);
-                                OperateResult.AppendText("<<转换成功\n", Color.Green);
+                                OperateResult.AppendText("<<序列号"+bsncode+"成功转换为"+sncode.Text+"\n", Color.Green);
                                 //记录日志
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
                                 LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
@@ -256,7 +259,16 @@ namespace UAS_MES.Make
                                 ChangeResult.Enabled = true;
                             }
                             else
-                                OperateResult.AppendText("<<序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                            {
+                                if (onlyPass)
+                                {
+                                    OperateResult.AppendText("<<SN号"+sncode.Text+"错误,已完成转号只允许SN转SN\n", Color.Red);
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText("<<SN号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                }
+                            }
                             sncode.Text = "";
                         }
                     }
@@ -284,6 +296,7 @@ namespace UAS_MES.Make
             bsncode = "";
             OperateResult.AppendText(">>请输入TSN号\n", Color.Green, show_sncode);
             ChangeResult.Enabled = true;
+            onlyPass = false;
         }
         /// <summary>
         /// 工单号keydown

UAS_AutoPass/AutoAnalysisXml.cs

@@ -549,7 +549,7 @@ namespace UAS_AutoPass
                 {
                     //获取资源,线别,工序相等，并且状态在线的序列号进行分配
                     sql.Clear();
-                    sql.Append("selecip ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
+                    sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
                     sql.Append("ms_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (dt.Rows.Count > 0)