章政 8 éve
szülő
commit
69ddffd4f9

+ 3 - 15
UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -78,23 +78,11 @@ namespace UAS_MES.Make
                                 isnetcode = true;
                                 return;
                             }
-                            else
-                            {
-                                sncode.Text = "";
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                            }
+                            else OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red, sncode);
                         }
-                        else
-                        {
-                            sncode.Text = "";
-                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
-                        }
-                    }
-                    else
-                    {
-                        sncode.Text = "";
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        else  OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
                     }
+                    else OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
                 }
                 //采集netcode
                 else

+ 3 - 3
UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -96,8 +96,8 @@ namespace UAS_MES.Make
                         {
                             sql.Clear();
                             sql.Append("select ms_makecode,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion from makeserial left join make on ");
-                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_sncode=:sncode");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
+                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
@@ -162,7 +162,7 @@ namespace UAS_MES.Make
                         string sp_ifforsn = ListA.Rows[RemainIndex]["sp_ifforsn"].ToString();
                         string sp_tracekind = ListA.Rows[RemainIndex]["sp_tracekind"].ToString();
                         string sp_barcoderule = ListA.Rows[RemainIndex]["sp_barcoderule"].ToString();
-                        if (LogicHandler.CheckSNBeforeLoad(ma_code,code.Text, sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
+                        if (LogicHandler.CheckSNBeforeLoad(ma_code, code.Text, sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
                         {
                             CollectData.Add(code.Text);
                             CollectDataSonCode.Add(ListA.Rows[RemainIndex]["sp_soncode"].ToString());