Merge repos.ubtob.net:usoft/mes-client

UAS_MES_WEIP/CustomControl/RichText/RichTextAutoBottom.cs

@@ -32,7 +32,8 @@ namespace UAS_MES_NEW.CustomControl.RichText
         public void AppendText(string str, Color color)
         {
             SelectionColor = color;
-            base.AppendText(str);
+            string timePrefix = $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss} ] ";
+            base.AppendText(timePrefix + str);
             //如果颜色是红色则进行提示音
             if (color == Color.Red && Entity.SystemInf.CheckAudioEnable)
             {

UAS_MES_YTDZ/FunctionCode/Make/Make_TestCollection.cs

@@ -1220,10 +1220,20 @@ namespace UAS_MES_NEW.Make
                 }
                 if (LogicHandler.UpdateStencil(ma_code.Text, User.UserSourceCode, (pr_pcbacount.Value * count).ToString(), User.UserCode, out ErrorMessage))
                 {
-                    dh.ExecuteSql("insert into makehourcount(mhc_id,mhc_macode,mhc_indate,MHC_SOURCECODE,mhc_stepcode, MHC_INMAN,mhc_qty,mhc_linecode,mhc_pcbcount)" +
+                    if (GoodProduct.Checked)
+                    {
+                        dh.ExecuteSql("insert into makehourcount(mhc_id,mhc_macode,mhc_indate,MHC_SOURCECODE,mhc_stepcode, MHC_INMAN,mhc_qty,mhc_linecode,mhc_pcbcount)" +
                        "values(makehourcount_seq.nextval,'" + ma_code.Text + "',sysdate,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "','" + User.UserCode + "','" + pr_pcbacount.Value * count + "','" + User.UserLineCode + "','" + pr_pcbacount.Value + "')", "insert");
-                    OperateResult.AppendText(">采集成功,个数量" + count + ",拼板产品数" + pr_pcbacount.Value * count + "\n", Color.Green, SNCount);
-                    return;
+                        OperateResult.AppendText(">采集成功,个数量" + count + ",拼板产品数" + pr_pcbacount.Value * count + "\n", Color.Green, SNCount);
+                        return;
+                    }
+                    if (Reject.Checked)
+                    {
+                        dh.ExecuteSql("insert into makehourcount(mhc_id,mhc_macode,mhc_indate,MHC_SOURCECODE,mhc_stepcode, MHC_INMAN,MHC_NGQTY,mhc_linecode,mhc_pcbcount)" +
+                       "values(makehourcount_seq.nextval,'" + ma_code.Text + "',sysdate,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "','" + User.UserCode + "','" + pr_pcbacount.Value * count + "','" + User.UserLineCode + "','" + pr_pcbacount.Value + "')", "insert");
+                        OperateResult.AppendText(">采集成功,个数量" + count + ",拼板产品数" + pr_pcbacount.Value * count + "\n", Color.Green, SNCount);
+                        return;
+                    }
                 }
                 else
                 {