打印标签，QC抽检修改

UAS_MES_YDCY/FunctionCode/OQC/OQC_CancelMakeDown.Designer.cs

@@ -38,18 +38,20 @@
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.batch = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.reason = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // sn_code_label
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(68, 215);
+            this.sn_code_label.Location = new System.Drawing.Point(41, 218);
             this.sn_code_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(146, 41);
+            this.sn_code_label.Size = new System.Drawing.Size(94, 41);
             this.sn_code_label.TabIndex = 104;
-            this.sn_code_label.Text = "下地批号";
+            this.sn_code_label.Text = "SN号";
             // 
             // pr_detail
             // 
@@ -134,7 +136,7 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(316, 430);
+            this.Confirm.Location = new System.Drawing.Point(315, 521);
             this.Confirm.Margin = new System.Windows.Forms.Padding(8);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
@@ -162,11 +164,31 @@
             this.batch.TabIndex = 140;
             this.batch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
+            // reason
+            // 
+            this.reason.Location = new System.Drawing.Point(226, 433);
+            this.reason.Name = "reason";
+            this.reason.Size = new System.Drawing.Size(388, 35);
+            this.reason.TabIndex = 238;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(41, 427);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(146, 41);
+            this.label1.TabIndex = 239;
+            this.label1.Text = "解除原因";
+            // 
             // OQC_CancelMakeDown
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1566, 802);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.reason);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.pr_code);
@@ -182,7 +204,7 @@
             this.Tag = "Special!CancelCollection";
             this.Text = "取消采集";
             this.Load += new System.EventHandler(this.Special_CancelCollection_Load);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -197,5 +219,7 @@
         private System.Windows.Forms.Label label6;
         private CustomControl.TextBoxWithIcon.EnterTextBox pr_code;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox reason;
+        private System.Windows.Forms.Label label1;
     }
 }

UAS_MES_YDCY/FunctionCode/OQC/OQC_CancelMakeDown.cs

@@ -23,8 +23,12 @@ namespace UAS_MES_NEW.OQC
 
         private void Confirm_Click(object sender, EventArgs e)
         {
+            if (reason.Text == "") {
+                OperateResult.AppendText(">>解除原因必填\n", Color.Red, this.batch);
+                return;
+            }
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(MS_IFQCCHECK,0)MS_IFQCCHECK,ms_makecode,ms_stepcode,ms_status,pr_detail,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode,nvl(ms_qccheck,0)ms_qccheck from makeserial left join product on pr_code=ms_prodcode where ms_downcode='" + batch.Text + "'  order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_batchcode,nvl(MS_IFQCCHECK,0)MS_IFQCCHECK,ms_makecode,ms_stepcode,ms_status,pr_detail,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode,nvl(ms_qccheck,0)ms_qccheck from makeserial left join product on pr_code=ms_prodcode where ms_downcode='" + batch.Text + "'  order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 pr_code.Text = dt.Rows[0]["ms_prodcode"].ToString();
@@ -39,6 +43,7 @@ namespace UAS_MES_NEW.OQC
                     return;
                 }
                 dh.ExecuteSql("update makeserial set ms_downstatus=0 where ms_downcode='" + batch.Text + "'  ", "update");
+                dh.ExecuteSql("update makedown set MD_STATUS=0,MD_UPREASON='" + reason.Text + "' where md_code='" + batch.Text + "'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "解除锁定不良品", "解除锁定不良品", this.batch.Text, "");
                 OperateResult.AppendText(">>批次号" + this.batch.Text + "解除锁定不良品\n", Color.Green, this.batch);
             }

UAS_MES_YDCY/FunctionCode/OQC/OQC_CancelMakeDown.resx

@@ -177,7 +177,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -308,7 +308,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_NEW.cs

@@ -86,38 +86,38 @@ namespace UAS_MES_NEW.OQC
                         pr_code.Text = dt.Rows[0]["PR_QUALMETHOD"].ToString();
                         if (ms_ifqccheck == "0")
                         {
-                            OperateResult.AppendText(">>非QC抽检序列号，不允许采集\n", Color.Red, ms_sncode);
+                            OperateResult.AppendText(">>非QC抽检序列号，不允许采集\n", Color.Red);
                             return;
                         }
                     }
                 }
                 else
                 {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
-
+                ms_sncode.SelectAll();
             }
         }
 
         private void SaveData_Click(object sender, EventArgs e)
         {
-            if (GoodProduct.Checked)
+            List<string> oi_itemcode_insert = new List<string>();
+            List<string> ois_ifng_insert = new List<string>();
+            for (int i = 0; i < CheckTypeDGV.Rows.Count; i++)
             {
-                List<string> oi_itemcode_insert = new List<string>();
-                List<string> ois_ifng_insert = new List<string>();
-                for (int i = 0; i < CheckTypeDGV.Rows.Count; i++)
-                {
-                    if (CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
-                    {
-                        oi_itemcode_insert.Add(CheckTypeDGV.Rows[i].Cells["pd_itemname"].Value.ToString());
-                        ois_ifng_insert.Add(CheckTypeDGV.Rows[i].Cells["CheckResult"].FormattedValue.ToString() == "True" ? "-1" : "0");
-                    }
-                }
-                if (oi_itemcode_insert.Count == 0)
+                if (CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
                 {
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "必须勾选检验项目\n", Color.Green, ms_sncode);
-                    return;
+                    oi_itemcode_insert.Add(CheckTypeDGV.Rows[i].Cells["pd_itemname"].Value.ToString());
+                    ois_ifng_insert.Add(CheckTypeDGV.Rows[i].Cells["CheckResult"].FormattedValue.ToString() == "True" ? "-1" : "0");
                 }
+            }
+            if (oi_itemcode_insert.Count == 0)
+            {
+                OperateResult.AppendText(">>" + ms_sncode.Text + "必须勾选检验项目\n", Color.Green, ms_sncode);
+                return;
+            }
+            if (GoodProduct.Checked)
+            {
                 sql.Clear();
                 //when () then 
                 sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
@@ -141,6 +141,15 @@ namespace UAS_MES_NEW.OQC
             {
                 if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "不良品采集", "NG", User.UserCode, out ErrorMessage))
                 {
+                    sql.Clear();
+                    //when () then 
+                    sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
+                    sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
+                    sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
+                    sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
+                    dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
+                        oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
+                    dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
                     dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
                     OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");

UAS_MES_YDCY/FunctionCode/OQC/OQC_QCRecheck.cs

@@ -23,7 +23,11 @@ namespace UAS_MES_NEW.OQC
 
         private void Confirm_Click(object sender, EventArgs e)
         {
-
+            if (inputreson.Text == "")
+            {
+                OperateResult.AppendText(">>下地原因必填\n", Color.Red);
+                return;
+            }
             //获取序列号的途程
             DataTable dt = (DataTable)dh.ExecuteSql("select nvl(MS_IFQCCHECK,0)MS_IFQCCHECK,ms_makecode,ms_stepcode,ms_status,pr_detail,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode,nvl(ms_qccheck,0)ms_qccheck from makeserial left join product on pr_code=ms_prodcode where (ms_sncode='" + sn_code.Text + "'  or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')  order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
@@ -50,7 +54,7 @@ namespace UAS_MES_NEW.OQC
                 sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
                 sql.Append("MD_SNCODE,MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
                 sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) select MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
-                sql.Append("'" + User.CurrentStepCode + "','" + sn_code.Text + "','" + pr_code.Text + "','" + ms_makecode + "','" + inputreson.Text + "','" + mdcode + "',sysdate,'" + User.UserCode + "','-1' from " +
+                sql.Append("'" + User.CurrentStepCode + "',ms_sncode,'" + pr_code.Text + "','" + ms_makecode + "','" + inputreson.Text + "','" + mdcode + "',sysdate,'" + User.UserCode + "','-1' from " +
                     "makeserial where  ms_sncode in (select sp_sncode from steppassed where sp_date>to_date('" + sp_date + "','yyyy-mm-dd hh24:mi:ss')-30/1440 and sp_date<to_date('" + sp_date + "','yyyy-mm-dd hh24:mi:ss')+30/1440 and  sp_stepcode='" + ms_stepcode + "' and sp_makecode='" + ms_makecode + "')");
                 //执行
                 dh.ExecuteSql(sql.GetString(), "insert");

UAS_MES_YDCY/FunctionCode/Special/Special_CancelCollection.cs

@@ -106,13 +106,13 @@ namespace UAS_MES_NEW.Special
                 //sqls.Add("delete from commandlog where cl_makecode='" + ms_makecode + "' and cl_sncode='" + sn_code.Text + "'");
                 //删除过站记录
                 //sqls.Add("delete from makeprocess where mp_sncode='" + sn_code.Text + "' and mp_makecode='" + ms_makecode + "'");
-                //投入数-1
-                sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
+              
                 //删除StepPass
                 sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' and sp_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from steppassed where sp_sncode='" + sn_code.Text + "' and sp_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                 dh.ExecuteSQLTran(sqls.ToArray());
+                dh.ExecuteSql("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'","update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");
                 OperateResult.AppendText(">>序列号" + sn_code.Text + "成功解除绑定\n", Color.Green, sn_code);
                 //}

UAS_MES_YDCY/FunctionCode/SystemSetting/SystemSetting_PrinterTest.Designer.cs

@@ -166,10 +166,10 @@
             this.SN.Checked = true;
             this.SN.Location = new System.Drawing.Point(356, 60);
             this.SN.Name = "SN";
-            this.SN.Size = new System.Drawing.Size(161, 28);
+            this.SN.Size = new System.Drawing.Size(185, 28);
             this.SN.TabIndex = 39;
             this.SN.TabStop = true;
-            this.SN.Text = "内部序列号";
+            this.SN.Text = "SN序列化打印";
             this.SN.UseVisualStyleBackColor = true;
             this.SN.CheckedChanged += new System.EventHandler(this.SN_CheckedChanged);
             // 
@@ -357,9 +357,9 @@
             this.MakeSnList.AutoSize = true;
             this.MakeSnList.Location = new System.Drawing.Point(710, 60);
             this.MakeSnList.Name = "MakeSnList";
-            this.MakeSnList.Size = new System.Drawing.Size(185, 28);
+            this.MakeSnList.Size = new System.Drawing.Size(209, 28);
             this.MakeSnList.TabIndex = 42;
-            this.MakeSnList.Text = "导入清单打印";
+            this.MakeSnList.Text = "导入SN清单打印";
             this.MakeSnList.UseVisualStyleBackColor = true;
             this.MakeSnList.CheckedChanged += new System.EventHandler(this.SN_CheckedChanged);
             // 

UAS_MES_YDCY/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -11,7 +11,7 @@ namespace UAS_MES_NEW.SystemSetting
 {
     public partial class SystemSetting_PrinterTest : Form
     {
-        Engine engine = new Engine();
+        Engine engine /*= new Engine()*/;
 
         LabelFormatDocument format;
         LabelFormatDocument format1;
@@ -169,10 +169,10 @@ namespace UAS_MES_NEW.SystemSetting
 
         private void SystemSetting_PrinterTest_Load(object sender, EventArgs e)
         {
-            label5.Visible = false;
-            engine.Start();
-            format = engine.Documents.Open(Application.StartupPath + "/Label.btw");
-            format1 = engine.Documents.Open(Application.StartupPath + "/Material.btw");
+            label5.Visible = true;
+            //engine.Start();
+            //format = engine.Documents.Open(Application.StartupPath + "/Label.btw");
+            //format1 = engine.Documents.Open(Application.StartupPath + "/Material.btw");
         }
 
         private void SN_CheckedChanged(object sender, EventArgs e)
@@ -180,13 +180,17 @@ namespace UAS_MES_NEW.SystemSetting
             if (SN.Checked)
             {
                 label6.Text = "机型相关配置";
+                label5.Text = "前缀";
                 label5.Visible = true;
                 label7.Visible = true;
                 ma_code.Visible = true;
                 label4.Visible = true;
+                Prefix.Visible = true;
                 Mark.Visible = true;
                 Rn.Visible = true;
                 label3.Visible = true;
+                label8.Visible = true;
+                NumLength.Visible = true;
                 this.pictureBox1.Image = global::UAS_MES_NEW.Properties.Resources.SN;
             }
             else if (MakeSnList.Checked)
@@ -195,19 +199,21 @@ namespace UAS_MES_NEW.SystemSetting
                 label5.Visible = false;
                 label7.Visible = true;
                 ma_code.Visible = true;
+                Prefix.Visible = false;
                 label4.Visible = true;
                 Mark.Visible = true;
                 Rn.Visible = false;
                 label3.Visible = false;
                 this.pictureBox1.Image = null;
+                label8.Visible = false;
+                NumLength.Visible = false;
             }
             else
             {
                 this.pictureBox1.Image = global::UAS_MES_NEW.Properties.Resources.Material;
                 label6.Text = "标签部分(显示)";
                 label5.Visible = true;
-                label5.Text = "补打SN号";
-                Prefix.Visible = true;
+                Prefix.Visible = false;
                 label7.Visible = false;
                 ma_code.Visible = false;
                 label4.Visible = false;

UAS_MES_YDCY/FunctionCode/SystemSetting/SystemSetting_PrinterTest.resx

@@ -121,7 +121,7 @@
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAxIAAAGACAYAAAA59VSqAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAu7JJREFUeF7snQV01FgbhuteCgUKRYtLcXe3RZZlgcUWd1+cxRd3WHRxt+Lu/uMO
+        vgAADr4B6kKxwAAAu7JJREFUeF7snQV01FgbhuteCgUKRYtLcXe3RZZlgcUWd1+cxRd3WHRxt+Lu/uMO
         xYqXllKh7vb+J9PONLlJRtppy8D3nPOe3SY3N5mbXPK9uWYEAtfvvWM3EQRBEATxHUHvav1BZUnoCyN2
         w88IVSiCIAiC+L6hd7X+oLIk9AUZCapQBEEQBPHdQ+9q/UFlSegLMhJUoQiCIAjiu4fe1fqDypLQF2Qk
         qEIRBEEQxHcPvav1B5UloS/ISFCFIgiCIIjvHnpX6w8qS0JfkJGgCkUQBEEQ3z30rtYfVJaEviAjQRWK
@@ -1022,7 +1022,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -1153,7 +1153,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN