维修界面修改

UAS_MES_ZJT/FunctionCode/Make/Make_Repair.cs

@@ -563,7 +563,7 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
             }
-            dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "' and cr_prodcode='"+ ms_prodcode .Text+ "'", "select");
             if (dt.Rows.Count == 0)
                 OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
             else

UAS_MES_ZJT/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -112,6 +112,7 @@ namespace UAS_MES_NEW.Make
             this.SerialPortComBox_label = new System.Windows.Forms.Label();
             this.StartTest = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.ComList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.SerialPortCombox();
+            this.TestResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             this.SuspendLayout();
             // 
@@ -177,7 +178,7 @@ namespace UAS_MES_NEW.Make
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
             this.GoodProduct.Location = new System.Drawing.Point(12, 990);
-            this.GoodProduct.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(6);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(129, 54);
             this.GoodProduct.TabIndex = 35;
@@ -192,7 +193,7 @@ namespace UAS_MES_NEW.Make
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
             this.Reject.Location = new System.Drawing.Point(176, 990);
-            this.Reject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Reject.Margin = new System.Windows.Forms.Padding(6);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(167, 54);
             this.Reject.TabIndex = 36;
@@ -213,7 +214,7 @@ namespace UAS_MES_NEW.Make
             this.WaitRejectList.FullRowSelect = true;
             this.WaitRejectList.HideSelection = false;
             this.WaitRejectList.Location = new System.Drawing.Point(8, 563);
-            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(6);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(528, 407);
             this.WaitRejectList.TabIndex = 37;
@@ -295,7 +296,7 @@ namespace UAS_MES_NEW.Make
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChoosedRejectList.HideSelection = false;
             this.ChoosedRejectList.Location = new System.Drawing.Point(736, 563);
-            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(6);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(528, 407);
             this.ChoosedRejectList.TabIndex = 50;
@@ -591,7 +592,7 @@ namespace UAS_MES_NEW.Make
             this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ID = null;
             this.bc_code.Location = new System.Drawing.Point(188, 442);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(6);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
             this.bc_code.Size = new System.Drawing.Size(348, 40);
@@ -609,7 +610,7 @@ namespace UAS_MES_NEW.Make
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(186, 26);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
@@ -675,10 +676,10 @@ namespace UAS_MES_NEW.Make
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1288, 563);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.OperateResult.Location = new System.Drawing.Point(1288, 630);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(410, 409);
+            this.OperateResult.Size = new System.Drawing.Size(410, 342);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -690,7 +691,7 @@ namespace UAS_MES_NEW.Make
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
             this.CleanInfo.Location = new System.Drawing.Point(873, 291);
-            this.CleanInfo.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(6);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
@@ -706,7 +707,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
             this.ChooseedReject.Location = new System.Drawing.Point(584, 694);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(6);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(100, 46);
             this.ChooseedReject.TabIndex = 45;
@@ -717,7 +718,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
             this.WaitReject.Location = new System.Drawing.Point(584, 819);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(6);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(100, 46);
             this.WaitReject.TabIndex = 44;
@@ -730,7 +731,7 @@ namespace UAS_MES_NEW.Make
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
             this.bc_remark.Location = new System.Drawing.Point(740, 365);
-            this.bc_remark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(6);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
@@ -745,7 +746,7 @@ namespace UAS_MES_NEW.Make
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
             this.bc_groupcode.Location = new System.Drawing.Point(188, 365);
-            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(6);
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Size = new System.Drawing.Size(348, 37);
             this.bc_groupcode.TabIndex = 21;
@@ -758,7 +759,7 @@ namespace UAS_MES_NEW.Make
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(560, 995);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(358, 40);
@@ -789,7 +790,7 @@ namespace UAS_MES_NEW.Make
             this.SoftWarePath.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SoftWarePath.ID = null;
             this.SoftWarePath.Location = new System.Drawing.Point(793, 496);
-            this.SoftWarePath.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.SoftWarePath.Margin = new System.Windows.Forms.Padding(6);
             this.SoftWarePath.Name = "SoftWarePath";
             this.SoftWarePath.Power = null;
             this.SoftWarePath.Size = new System.Drawing.Size(388, 40);
@@ -1008,6 +1009,7 @@ namespace UAS_MES_NEW.Make
             this.StopTest.TabIndex = 223;
             this.StopTest.Text = "停止调试";
             this.StopTest.UseVisualStyleBackColor = true;
+            this.StopTest.Click += new System.EventHandler(this.StopTest_Click);
             // 
             // BaudRate_label
             // 
@@ -1016,7 +1018,7 @@ namespace UAS_MES_NEW.Make
             | System.Windows.Forms.AnchorStyles.Right)));
             this.BaudRate_label.AutoSize = true;
             this.BaudRate_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate_label.Location = new System.Drawing.Point(1266, 450);
+            this.BaudRate_label.Location = new System.Drawing.Point(1266, 436);
             this.BaudRate_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.BaudRate_label.Name = "BaudRate_label";
             this.BaudRate_label.Size = new System.Drawing.Size(114, 41);
@@ -1028,7 +1030,7 @@ namespace UAS_MES_NEW.Make
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1418, 456);
+            this.BaudRate.Location = new System.Drawing.Point(1418, 442);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
@@ -1081,12 +1083,23 @@ namespace UAS_MES_NEW.Make
             this.ComList.Size = new System.Drawing.Size(280, 40);
             this.ComList.TabIndex = 218;
             // 
+            // TestResult
+            // 
+            this.TestResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TestResult.Location = new System.Drawing.Point(1288, 575);
+            this.TestResult.Margin = new System.Windows.Forms.Padding(6);
+            this.TestResult.Name = "TestResult";
+            this.TestResult.Size = new System.Drawing.Size(410, 43);
+            this.TestResult.TabIndex = 224;
+            this.TestResult.Text = "";
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1731, 1070);
+            this.Controls.Add(this.TestResult);
             this.Controls.Add(this.StopTest);
             this.Controls.Add(this.BaudRate_label);
             this.Controls.Add(this.BaudRate);
@@ -1157,7 +1170,7 @@ namespace UAS_MES_NEW.Make
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
@@ -1252,5 +1265,6 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label SerialPortComBox_label;
         private CustomControl.ButtonUtil.NormalButton StartTest;
         private CustomControl.ComBoxWithFocus.SerialPortCombox ComList;
+        private CustomControl.RichText.RichTextAutoBottom TestResult;
     }
 }

UAS_MES_ZJT/FunctionCode/Make/Make_TestCollection.cs

@@ -51,7 +51,7 @@ namespace UAS_MES_NEW.Make
 
         bool LockSn = false;
 
-        DataTable Dbfind;   
+        DataTable Dbfind;
 
         public Make_TestCollection()
         {
@@ -211,6 +211,13 @@ namespace UAS_MES_NEW.Make
                                 LockMakeCode.Checked = true;
                             }
                         }
+                        if (User.CurrentStepName == "电测")
+                        {
+                            if (TestResult.Text == "") {
+                                OperateResult.AppendText("请先测试后再扫码",Color.Red,ms_sncode);
+                                return;
+                            }
+                        }
                         dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_badtimes,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
                         string status = dt.Rows[0]["ms_status"].ToString();
                         reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
@@ -375,7 +382,11 @@ namespace UAS_MES_NEW.Make
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n");
                             LastSncode = ms_sncode.Text;
+                            dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,STD_VALUE1)" +
+                                     "values(STEPTESTDETAIL_seq.nextval,'" + ms_sncode.Text + "','" + TestResult.Text + "')", "insert");
+                            TestResult.Clear();
                             OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
+
                             //恢复出厂设置
                             if (AutoBadCode.Checked)
                                 BaseUtil.GetDataFromDevice("RESET");
@@ -549,6 +560,10 @@ namespace UAS_MES_NEW.Make
                         else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
                     }
                     else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
+
+                    dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,STD_VALUE1)" +
+                                    "values(STEPTESTDETAIL_seq.nextval,'" + ms_sncode.Text + "','" + TestResult.Text + "')", "insert");
+                    TestResult.Clear();
                     LastSncode = ms_sncode.Text;
                     //采集完不良，聚焦序列号
                     ms_sncode.Focus();
@@ -720,6 +735,13 @@ namespace UAS_MES_NEW.Make
         private void Make_TestCollection_FormClosing(object sender, FormClosingEventArgs e)
         {
             dh.Dispose();
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Interrupt();
+            }
         }
 
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
@@ -801,7 +823,7 @@ namespace UAS_MES_NEW.Make
                 dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode + "'", "delete");
                 dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode + "' and makecode='" + ms_makecode + "'", "delete");
                 dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='',ms_nextstepcode='B_WRITE' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ms_makecode + "'", "update");
-                LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, ms_makecode, User.UserLineCode,User.UserSourceCode,"取消绑定","取消绑定成功",ms_sncode,"");
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消绑定", "取消绑定成功", ms_sncode, "");
                 OperateResult.AppendText(">>" + ms_sncode + "解绑成功\n", Color.Green);
             }
             else
@@ -840,6 +862,8 @@ namespace UAS_MES_NEW.Make
             catch (Exception mes) { MessageBox.Show(mes.Message); }
         }
 
+        private StringBuilder _serialBuffer = new StringBuilder();
+
         private void GetSerialData()
         {
             if (serialPort1.IsOpen)
@@ -853,14 +877,29 @@ namespace UAS_MES_NEW.Make
                         {
                             try
                             {
-                                Thread.Sleep(100);
                                 int len = serialPort1.BytesToRead;
-                                Byte[] readBuffer = new Byte[len];
-                                serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
-                                string weigh = Encoding.Default.GetString(readBuffer);
+                                byte[] readBuffer = new byte[len];
+                                serialPort1.Read(readBuffer, 0, len);
+
+                                // 将接收到的数据追加到缓冲区
+                                _serialBuffer.Append(Encoding.Default.GetString(readBuffer));
+
+                                // 检查是否收到完整的数据（例如以换行符或特定字符结尾）
+                                string bufferContent = _serialBuffer.ToString();
+                                if (bufferContent.Contains("\n") || bufferContent.Contains("\r"))
+                                {
+                                    // 处理完整的数据
+                                    string weigh = bufferContent.Trim(); // 去除可能的换行符 
+                                    TestResult.AppendText(weigh + "\n");
+
+                                    // 清空缓冲区以准备接收下一组数据
+                                    _serialBuffer.Clear();
+
+                                }
                             }
-                            catch (Exception)
+                            catch (Exception ex)
                             {
+                                OperateResult.AppendText(ex.Message);
                                 ReadData = false;
                             }
                         }
@@ -871,5 +910,16 @@ namespace UAS_MES_NEW.Make
                     MessageBox.Show("端口已被占用，请关闭其他窗口");
             }
         }
+
+        private void StopTest_Click(object sender, EventArgs e)
+        {
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Interrupt();
+            }
+        }
     }
 }

UAS_MES_ZJT/FunctionCode/Make/Make_TestCollection.resx

@@ -259,7 +259,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -464,7 +464,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -595,7 +595,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN