Merge remote-tracking branch 'refs/remotes/origin/master'

MES接口/LogicHandler.cs

@@ -369,7 +369,8 @@ namespace MES_Interface
                         sql.Append("sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
                         sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "'");
                         dh.BatchInsert(sql.ToString(), new string[] { "bc_code"}, BadCode);
-                        dh.BatchInsert("",new string[] { "BadCode"},BadCode);
+                        //将不良的序列号的状态码设为3
+                        dh.ExecuteSql("update makeserial set ms_status='3' where ms_sncode=:sncode","update",iSN);
                     }
                     break;
                 default:
@@ -409,7 +410,7 @@ namespace MES_Interface
             oErrorMessage = "";
             string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, oErrorMessage };
             dh.CallProcedure("CS_SETSTEPRESULT", ref param);
-            oErrorMessage = param[4];
+            oErrorMessage = param[5];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -74,6 +74,9 @@ namespace UAS_MES.Make
         {
             Dbfind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
+            LoadBadGroupData();
+            LoadCollectedNum();
+            LoadCheckQTY();
         }
 
         /// <summary>

UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -68,7 +68,7 @@ namespace UAS_MES.Query
                     //如果为不良的时候
                     string BadStep = "";
                     string RejectStep = "";
-                    string reworkStep ="";
+                    string currentStep = "";
                     //先判断是否是返工的
                     if (ifRework!= "0")
                     {
@@ -81,7 +81,6 @@ namespace UAS_MES.Query
                         {
                             RejectStep = dt.Rows[0]["ms_stepcode"].ToString();
                         }
-                            reworkStep = dt.Rows[0]["ms_stepcode"].ToString();
                     }
                     else
                     {
@@ -95,6 +94,7 @@ namespace UAS_MES.Query
                             RejectStep = dt.Rows[0]["ms_stepcode"].ToString();
                         }
                     }
+                    currentStep= dt.Rows[0]["ms_stepcode"].ToString();
                     //查询执行过的步骤
                     sql.Clear();
                     sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail on cd_crid = cr_id  left join makeserial ");
@@ -116,81 +116,44 @@ namespace UAS_MES.Query
                     bool passed = true;
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
-                        //如果是返工的，根据工序里的步骤判断，如果cd_detno大于当前步骤的cd_detno时候就显示白色
-                        if (ifRework != "0")
+                        //还未开始返工
+                        if (currentStep == "")
                         {
-                            //还未开始返工
-                            if (reworkStep=="") {
+                            passed = false;
+                        }
+                        //passed==true;说明经过了这一步
+                        if (passed)
+                        {
+                            if (BadStep == dt.Rows[i]["CD_STEPCODE"].ToString())
+                            {
+                                PaintColor.Add(Brushes.Red);
+                                //是不良品，后面就不执行
                                 passed = false;
                             }
-                            //passed==true;说明经过了这一步
-                            if (passed)
+                            else
                             {
-                                if (BadStep == dt.Rows[i]["CD_STEPCODE"].ToString())
-                                {
-                                    PaintColor.Add(Brushes.Red);
-                                }
+                                if (!PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString() + "," + RejectStep) || RejectStep == "")
+                                    PaintColor.Add(Brushes.Green);
                                 else
                                 {
-                                    if (!PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString() + "," + RejectStep) || RejectStep == "")
-                                        PaintColor.Add(Brushes.Green);
-                                    else
+                                    //判断之前有没有添加过黑色
+                                    if (PaintColor.Contains(Brushes.Black))
                                     {
-                                        //判断之前有没有添加过黑色
-                                        if (PaintColor.Contains(Brushes.Black))
-                                        {
-                                            //移除之前的，
-                                            int index = PaintColor.IndexOf(Brushes.Black);
-                                            PaintColor.RemoveAt(PaintColor.IndexOf(Brushes.Black));
-                                            PaintColor.Insert(index, Brushes.Green);
-                                        }
-                                        PaintColor.Add(Brushes.Black);
+                                        //移除之前的，
+                                        int index = PaintColor.IndexOf(Brushes.Black);
+                                        PaintColor.RemoveAt(PaintColor.IndexOf(Brushes.Black));
+                                        PaintColor.Insert(index, Brushes.Green);
                                     }
+                                    PaintColor.Add(Brushes.Black);
+                                    //是报废品,后面也不执行
+                                    passed = false;
                                 }
                             }
-                            //还没经过
-                            else {
-                                PaintColor.Add(Brushes.White);
-                            }
-                            //如果返工执行到了当前步
-                            if (reworkStep == dt.Rows[i]["CD_STEPCODE"].ToString())
-                            {
-                                passed = false;
-                            }
                         }
+                        //还没经过
                         else
-                        //非返工，是正常
                         {
-                            //包含说明是线内工序
-                            if (PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString()))
-                            {
-                                if (BadStep == dt.Rows[i]["CD_STEPCODE"].ToString())
-                                {
-                                    PaintColor.Add(Brushes.Red);
-                                }
-                                else
-                                {
-                                    if (!PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString() + "," + RejectStep) || RejectStep == "")
-                                        PaintColor.Add(Brushes.Green);
-                                    else
-                                    {
-                                        //判断之前有没有添加过黑色
-                                        if (PaintColor.Contains(Brushes.Black))
-                                        {
-                                            //移除之前的，
-                                            int index = PaintColor.IndexOf(Brushes.Black);
-                                            PaintColor.RemoveAt(PaintColor.IndexOf(Brushes.Black));
-                                            PaintColor.Insert(index, Brushes.Green);
-                                        }
-                                        PaintColor.Add(Brushes.Black);
-                                    }
-                                }
-                            }
-                            //不包含说明是线外工序
-                            else
-                            {
-                                PaintColor.Add(Brushes.White);
-                            }
+                            PaintColor.Add(Brushes.White);
                         }
                     }
                     if (ifRework != "0") {