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

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -94,9 +94,18 @@ namespace UAS_MES.Make
                         }
                         if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage2))
                         {
+                            //判断界面工单是否为空时的序列号是否自动归属工单
+                            if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out ErrorMessage2))
+                            {
+                                if (ms_makecode.Text == "")
+                                {
+                                    OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
+                                    return;
+                                }
+                            }
                             OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                             // 获取工单归属工单下一工序是否正确
-                            if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+                            if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text == "" ? oMakeCode : ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                             {
                                 sql.Clear();
                                 sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
@@ -175,10 +184,10 @@ namespace UAS_MES.Make
                             }
                         }
                         //根据序列号获取此时BT号
-                        ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
-                        if (sncode.Text == ms_bt)
+                        //ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
+                        if (dh.CheckExist("makeserial", "ms_bt = '" + sncode.Text + "'"))
                         {
-                            OperateResult.AppendText(">>BT错误,重复\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>录入错误，已存在此BT\n", Color.Red, sncode);
                             OperateResult.AppendText(">>请输入BT\n", Color.Black);
                             return;
                         }
@@ -239,11 +248,11 @@ namespace UAS_MES.Make
                             }
                         }
                     }
-                    //根据序列号获取此时网标号
-                    ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
-                    if (sncode.Text == ms_mac)
+                    ////根据序列号获取此时网标号
+                    //ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
+                    if (dh.CheckExist("makeserial", "ms_mac = '" + sncode.Text + "'"))
                     {
-                        OperateResult.AppendText(">>MAC错误,重复\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>录入错误，已存在此MAC\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Black);
                         return;
                     }

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -59,9 +59,18 @@ namespace UAS_MES.Make
                     }
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage2))
                     {
-                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+                        //判断界面工单是否为空时的序列号是否自动归属工单
+                        if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out ErrorMessage2))
+                        {
+                            if (ms_makecode.Text == "")
+                            {
+                                OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
+                                return;
+                            }
+                        }
+                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                         // 获取工单归属工单下一工序是否正确
-                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text == "" ? oMakeCode : ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                         {
                             sql.Clear();
                             sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
@@ -107,21 +116,21 @@ namespace UAS_MES.Make
                     //    } 
                     //}
                     #endregion
-                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     string ErrorMessage = "";
                     string result = "";
-                    //根据序列号获取此时网标号
-                    net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
+                    ////根据序列号获取此时网标号
+                    //net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
                     if (int.Parse(mcd_remainqty.Text) <= 0)
                     {
                         ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                         return;
                     }
-                    else if (sncode.Text == net_code)
+                    else if (dh.CheckExist("makeserial","ms_netcode = '"+sncode.Text+"'"))
                     {
                         sncode.Text = "";
-                        OperateResult.AppendText(">>网标错误,重复\n", Color.Red);
+                        OperateResult.AppendText(">>录入错误，已存在此网标\n", Color.Red);
                         OperateResult.AppendText(">>请输入网标\n", Color.Black);
                         return;
                     }