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

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -228,19 +228,8 @@ namespace UAS_MES.Make
                                 string sp_barcoderule = dtbar.Rows[0]["sp_barcoderule"].ToString();
                                 if (sp_tracekind != "2")
                                 {
-                                    string oMakeCode;
-                                    string ErrorMessage2;
-                                    //判断界面工单是否为空时的序列号是否自动归属工单
-                                    if (!LogicHandler.GetMakeInfo(LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(),out oMakeCode, out ErrorMessage2))
-                                    {
-                                        if (ms_makecode.Text == "")
-                                        {
-                                            OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red);
-                                            continue;
-                                        }
-                                    }
                                     //上料校验规则判断
-                                    if (!LogicHandler.CheckSNBeforeLoad(oMakeCode, LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
+                                    if (!LogicHandler.CheckSNBeforeLoad(ms_makecode.Text, LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
                                     {
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                         LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));