From bd29472dea45f3fd8693473c515db37d998e2b00 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 17 八月 2021 18:32:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/Sc_StationOutSumReport.resx | 20
BLL/公用模块/Gy_DataInTmp.resx | 616 +++++++++----------
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 2
WorkM/报表分析/Sc_StationOutSumReport.cs | 4
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.designer.cs | 35
PlanM/数据导入/Gy_DataIn_RoutingBill.cs | 578 ++++++++++--------
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 5
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 38 +
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 44 +
BLL/公用模块/Gy_DataInTmp.designer.cs | 110 ++-
WorkM/流转卡管理/Sc_ProcessExchangeBill.designer.cs | 156 ++++
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.cs | 3
WorkM/报表分析/Sc_StationOutSumReport.designer.cs | 215 ++++--
13 files changed, 1,079 insertions(+), 747 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
index ddfb83e..0e5ecbf 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
@@ -50,6 +50,7 @@
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
this.txtHDataInTmp = new System.Windows.Forms.TextBox();
this.cmdHDataInTmp = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
@@ -104,7 +105,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1095, 47);
+ this.Tool.Size = new System.Drawing.Size(1460, 59);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -113,7 +114,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
//
// mrlk
//
@@ -123,7 +124,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 44);
+ this.mrlk.Size = new System.Drawing.Size(73, 56);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -133,7 +134,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
//
// bclk
//
@@ -143,7 +144,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 44);
+ this.bclk.Size = new System.Drawing.Size(73, 56);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -153,7 +154,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
//
// dc
//
@@ -172,7 +173,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 59);
//
// set
//
@@ -219,7 +220,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
//
// sx
//
@@ -238,7 +239,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 59);
//
// Out
//
@@ -257,7 +258,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
//
// tc
//
@@ -276,13 +277,14 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.pb1);
this.pPic.Controls.Add(this.txtHDataInTmp);
this.pPic.Controls.Add(this.cmdHDataInTmp);
this.pPic.Controls.Add(this.label5);
@@ -290,16 +292,25 @@
this.pPic.Controls.Add(this.lbljl);
this.pPic.Controls.Add(this.lbldj);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 47);
+ this.pPic.Location = new System.Drawing.Point(0, 59);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1095, 45);
+ this.pPic.Size = new System.Drawing.Size(1460, 56);
this.pPic.TabIndex = 18;
+ //
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(920, 18);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(391, 23);
+ this.pb1.TabIndex = 104;
//
// txtHDataInTmp
//
- this.txtHDataInTmp.Location = new System.Drawing.Point(382, 14);
+ this.txtHDataInTmp.Location = new System.Drawing.Point(509, 18);
+ this.txtHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.txtHDataInTmp.Name = "txtHDataInTmp";
- this.txtHDataInTmp.Size = new System.Drawing.Size(178, 21);
+ this.txtHDataInTmp.Size = new System.Drawing.Size(236, 25);
this.txtHDataInTmp.TabIndex = 103;
this.txtHDataInTmp.Visible = false;
//
@@ -307,9 +318,10 @@
//
this.cmdHDataInTmp.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDataInTmp.Image")));
this.cmdHDataInTmp.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDataInTmp.Location = new System.Drawing.Point(560, 14);
+ this.cmdHDataInTmp.Location = new System.Drawing.Point(747, 18);
+ this.cmdHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.cmdHDataInTmp.Name = "cmdHDataInTmp";
- this.cmdHDataInTmp.Size = new System.Drawing.Size(22, 22);
+ this.cmdHDataInTmp.Size = new System.Drawing.Size(29, 28);
this.cmdHDataInTmp.TabIndex = 102;
this.cmdHDataInTmp.UseVisualStyleBackColor = true;
this.cmdHDataInTmp.Visible = false;
@@ -318,9 +330,10 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(314, 15);
+ this.label5.Location = new System.Drawing.Point(419, 19);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.Size = new System.Drawing.Size(82, 15);
this.label5.TabIndex = 35;
this.label5.Text = "瀵煎叆妯℃澘锛�";
this.label5.Visible = false;
@@ -331,55 +344,61 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 16);
+ this.lblCaption.Location = new System.Drawing.Point(16, 20);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鏁版嵁瀵煎叆";
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(943, 32);
+ this.lbljl.Location = new System.Drawing.Point(1257, 40);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(15, 15);
this.lbljl.TabIndex = 99;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(943, 14);
+ this.lbldj.Location = new System.Drawing.Point(1257, 18);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 15);
this.lbldj.TabIndex = 98;
//
// cmdHPath
//
this.cmdHPath.Image = ((System.Drawing.Image)(resources.GetObject("cmdHPath.Image")));
this.cmdHPath.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHPath.Location = new System.Drawing.Point(797, 6);
+ this.cmdHPath.Location = new System.Drawing.Point(1063, 8);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4);
this.cmdHPath.Name = "cmdHPath";
- this.cmdHPath.Size = new System.Drawing.Size(22, 22);
+ this.cmdHPath.Size = new System.Drawing.Size(29, 28);
this.cmdHPath.TabIndex = 34;
this.cmdHPath.UseVisualStyleBackColor = true;
this.cmdHPath.Click += new System.EventHandler(this.cmdHPath_Click);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(460, 7);
+ this.txtHPath.Location = new System.Drawing.Point(613, 9);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4);
this.txtHPath.Multiline = true;
this.txtHPath.Name = "txtHPath";
- this.txtHPath.Size = new System.Drawing.Size(336, 40);
+ this.txtHPath.Size = new System.Drawing.Size(447, 49);
this.txtHPath.TabIndex = 33;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(390, 7);
+ this.label4.Location = new System.Drawing.Point(520, 9);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(65, 12);
+ this.label4.Size = new System.Drawing.Size(82, 15);
this.label4.TabIndex = 32;
this.label4.Text = "鏂囦欢璺緞锛�";
//
@@ -390,11 +409,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 142);
+ this.grdMain.Location = new System.Drawing.Point(0, 177);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1095, 470);
+ this.grdMain.Size = new System.Drawing.Size(1460, 588);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -406,12 +427,14 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 612);
+ this.grdSum.Location = new System.Drawing.Point(0, 765);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1095, 19);
+ this.grdSum.Size = new System.Drawing.Size(1460, 24);
this.grdSum.TabIndex = 48;
//
// timer1
@@ -421,10 +444,12 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(535, 303);
+ this.grdPrint.Location = new System.Drawing.Point(713, 379);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 49;
this.grdPrint.Visible = false;
//
@@ -435,22 +460,24 @@
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.cmdHPath);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 92);
+ this.panel1.Location = new System.Drawing.Point(0, 115);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1095, 50);
+ this.panel1.Size = new System.Drawing.Size(1460, 62);
this.panel1.TabIndex = 50;
//
// Gy_DataInTmp
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1095, 631);
+ this.ClientSize = new System.Drawing.Size(1460, 789);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.panel1);
this.Controls.Add(this.grdPrint);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_DataInTmp";
this.Text = "鏁版嵁瀵煎叆";
this.Load += new System.EventHandler(this.Gy_DataInTmp_Load);
@@ -503,5 +530,6 @@
public System.Windows.Forms.Button cmdHPath;
public System.Windows.Forms.TextBox txtHPath;
public System.Windows.Forms.Label label4;
+ public System.Windows.Forms.ProgressBar pb1;
}
}
\ No newline at end of file
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
index a1dfa70..59467e8 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
@@ -112,296 +112,256 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="OpenExcelFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="OpenExcelFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>266, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAQEASABIAAD/7QkuUGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAAAAAAAAAA
- AAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAIASAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAA
- OEJJTQQNAAAAAAAEAAAAeDhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQK
- AAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAAB
- AC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4
- AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPo
- AAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhC
- SU0EAAAAAAAAAgABOEJJTQQCAAAAAAAEAAAAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklN
- BB4AAAAAAAQAAAAAOEJJTQQaAAAAAAM/AAAABgAAAAAAAAAAAAAAaAAABAAAAAAFZypoB5iYAC0AMQAA
- AAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAEAAAAAGgAAAAAAAAAAAAAAAAAAAAAAQAAAAAA
- AAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0
- MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdo
- dGxvbmcAAAQAAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJ
- RGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAA
- AA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNP
- YmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRv
- bWxvbmcAAABoAAAAAFJnaHRsb25nAAAEAAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAA
- AAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29s
- AQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24A
- AAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAA
- C2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxv
- bmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdo
- dE91dHNldGxvbmcAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAjhCSU0EDAAAAAADbAAA
- AAEAAACAAAAADQAAAYAAABOAAAADUAAYAAH/2P/gABBKRklGAAECAQBIAEgAAP/tAAxBZG9iZV9DTQAC
- /+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwM
- DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwM
- DBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgADQCAAwEiAAIRAQMRAf/dAAQACP/EAT8A
- AAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAAB
- BAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1
- FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3
- 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
- CwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
- /8AAEQgAKQQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB
- AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYn
- KCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqi
- o6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8B
- AAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS
- QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZX
- WFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
- x8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8A
- iaP+Eku/+eUP/fpP/iapfZ6Ps9er7NHn87Lv/CR3f/PKH/v0n/xNH/CR3f8Azyh/79J/8TVL7PR9no5E
- HOy7/wAJHd/88of+/Sf/ABNH/CR3f/PKH/v0n/xNUvs9H2f2o5EHOy7/AMJHd/8APKH/AL9J/wDE0f8A
- CSXf/PKH/v0n/wATVL7P7UfZ/ajkQc7Lv/CSXf8Azyh/79J/8TR/wkl3/wA8of8Av0n/AMTVL7P7UfZ/
- ajkQc7Lv/CR3X/PKH/v0n/xNH/CR3X/PKH/v0n/xNUvs/tR9no5EHOy7/wAJHdf88of+/af/ABNH/CR3
- f/PKH/v0n/xNUvs9H2ejkQc7Lv8Awkd1/wA8of8Av2n/AMTR/wAJHdf88of+/af/ABNUvs/tR9n9qORB
- zsu/8JHd/wDPKH/v2n/xNH/CR3f/ADyh/wC/af8AxNUvs/tR9n9qORBzsu/8JJdf88of+/Sf4Uf8JJdf
- 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
- 6K5iiiwHT0VzFFFgOnormKKLAf/Z
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFkb2JlX0NNAAL/7gAO
+ QWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90ABAAI/8QBPwAAAQUB
+ AQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMC
+ BAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKD
+ JkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3
+ x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVj
+ czTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
+ 9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCSW+kpeLN4
+ /Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/uZn/AG7X/wCSS/5r
+ 4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mv
+ g/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCS
+ W+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A
+ 5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP
+ FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAKQQAAwEi
+ AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAAB
+ fQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNE
+ RUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
+ tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA
+ AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRC
+ kaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpz
+ dHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+ 2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8AiaP+Eku/+eUP/fpP
+ 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
+ OnormKKLAf/Z
</value>
</data>
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPfZLfS1NhHMZfkSSwu/A/8MK6ydIQFlg3dudN
- YBLDYtBF05XMMAoLL3bhRGF4zjzUUiKiG4mCgkCMiam5cqP9aO4YJlqIDmqh00KRHt/v92xnW7gdeHgP
- 7/t8nvd533OEyDxuZRQDymMoXh/U4cNFa+TpV58gy/Ho8vgwOR1A5ywgFClvEck15xzwbuoDiDFD7rtV
- bG2l4fDv4FkSJdU5uYO09BJjBtx1ebCZSkEMAjNpwL0IWKeBky9kE01KzYiaDYG9xJgB3b0D+JVMQngA
- bRm4OgPUvgLKfBJ4KPUoJy0m3/9/nD192Fhb43T7xxJw3IBDZyoxe1zkgm7dc+HHyipXbXhdZOcMfMwR
- wp9qAQSBz5YqI6S9uxfLS9/49o+MHFI7D36e2GaIQgJVmRY3nD3QE1+NC6OA0Zy0hFH7qD0IgiN7wGnv
- d25hBlx33EEoqsOqBCGuBCCshrSJDYYr7OECmDeof5q7A1t7Fz7FljAvQyJfdETjOn6mfrOhvCNeGiZT
- i60DNXWNOHH2gimaV6+JovC4/73R4PaDPmz+3S/Q7v4/XqQAzF/iM+fXpnViiOWAsL6CoeERczThvXVg
- N8wh2TNHYwuILK6ynwNuyk/YfNnGidkxP6DNIkCiubfj/gIfsYKgU5Ym1J67aIrMNXXnQUfI/rVjL98U
- eIhpbrXhAL2UTLYOQlZyAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
</value>
</data>
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPjZPNS1RhFMaPIbRoFy4yEFFyoYkRbqNWCkIr
- /wE/G0VwEwmpbWbXh1+YtipQF0GDklQULlqqMzY5+cFYTo1DisMgDs6Xo3N1Hp/jbRgTvfjCw33ve5/z
- e89533NFHrghdbMIdQJrjy8m9WrMcaw0zuHLNhAD8PuCUq/GaKyI7Tsk/yknIikjBcMwLKUe9co1xmis
- NM2h8hNpHNPTgHPWWupRb7s7k0GjC7ffm4vxZBKJPWupR73VU4xpcOkZZAEzM9zdaS31KOCGQzM4BdiK
- xLAdjVtKPQq49IaApn+AykwJkSgS0Zil4vQcH+LQCcCdj8Dl11x4vgvp24cMGGdLv/Xuo6BjGTLI22jW
- a2Qdd3kLV0cIeLYDqf0KKeqBFPf9r6JeBnyD1Dthn4rTGzkFGCWgO2imd96o4471Loyv0GsPnQF4FDAB
- 119AOjbw9495I/OeQwT8B2xfE+DwEtC1zlZmRprWvc8sYYyL7T9NQEk/AX54fwALi4fw/kohuMn6TwIe
- +kxATpUDhfZV5L0lwLaA9C6fhcygZQk+7qTBvrUkwmE2UAagJbQt0a8/E0du9TtceeIn0YNICAisAsEA
- sLHOZ+gA4Z0U0uk9Ng57v9mNST8BLR5I63z2zHJqJiAVw5CbQ5Cyl1mV8l1VRt16Zaqc8wrq/gccAYEZ
- rI51LX54AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
</value>
</data>
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD6SURBVDhPrZMvD4MwEMX7TdEzc3NLWjGDmCJzFLlWTeDR
- xRaLXCXf4XbH38LSNWwjeYKk/fXduzuWJAnsFWMMUMNHl7uug6dz0LYtWGvBmBqqqoKyLEErDVJKyLIM
- 0jQFLgRdhjzPB8gEcCuAWQB6DRA8AmjIQb0AFAJO+OLkQHxycMeDBeqGuqIuqDOKAEcUlRAEPPDAlEHt
- OdAbBzxUwgxo3kvwQxScR0L8C8D4Iaq5jQcsk4uIA4mHjAfQeg34uQvBEN1zmERqo+9AkYNimcToINlN
- iNTGwh/l4CSODghQ+7vgZdAP0hYwblbf2z2al4kWin6+Ed19ASAtZRPFvKE6AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
+ wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
+ iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
+ /QtOBosOaPWFo3IBwJtvBADwBiAtZRNHCGN5AAAAAElFTkSuQmCC
</value>
</data>
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEHSURBVDhPhZKxDYQwDEXZ6Xa6FVgAMQISHcUNQkWVnooh
- 6Oh8fCffOODTRbJQov9fvk2arusE1ZTFvTuXvu+tqLMvzXfQTSj7vstxHE+QByzLoknwZbl0CkBt2wZd
- LgiKUQ8CM8Vge7OFNBp69TOAYZ7n+sZ8c704JMSzaKcQ523bKgRFIM5QSoGIfbE3tpRSknVdVQxdABAD
- cEAlgfabmpcAgkIC/ztLggvAmGk8TWcpoJiHYRAUAa6FC6DibNTFNqbp8zBzNpqWG/RKgKS3pRjHUQE+
- gRt0vo0QAGCOABwizNa/+5k6pAiAFnhjFT14DyEA5n9GCxIl8NEfL/DHQfUa3bsI5V+xFcwIIn269wAA
- AABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
+ TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
+ wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
+ /zMAK+AEvIh14aZmAHgzuloBzZ1fFA0vxpT+sRXMCLq81bkAAAAASUVORK5CYII=
</value>
</data>
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD4SURBVDhPlZO7DYNAEETpyT25BTqgBCQyAldABRRATkRE
- RkZGduatmWP5CoNGCLTzdo69S5IHV5ZlQXpQvi3BOI6jaZqm/0CY+74PwzBEAJCu68LcRjqGUty2ba0Y
- gCDOfG2kS5qmoa5rEyaSXJrVUfHojPjuQcQGyDdkESiS0TrM97tIQtM0JkAUU3cCCBEABKn7XB2a5BVB
- dPbjXBKsAK1XICXgmee5SQC3hBUggwcVRRHK8nMw69/YKPVC9D0EM5B9gsMeEIRoHuIB+omY4/rdTogz
- 1/oAAUDquIn+24mbywqrqoqzfmo8Bfmx3e77m+N5f2AW4xdr8dl8xOqDBAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPnZJNSwJRFIbvv6h+QNQycBnUPlpE0SJBSJAo
- ohA0chFiUihhaCmE2hdFtGgfQkQkVkIupHZBVERFSKljzjjjx9vcm06T+BEeeODeyz3PPXPmEIdvF3Z3
- ELbVgMKivF/2bsG3cwTSLKwrG6gVHvc1O24qsSx52MViqaRA9y5XVPE2lJhtLnZRyhcU6D4QPMXgqA7D
- WgOszvX6n2JccDBBNieBLyOIeRTpGZ9DXpIYdVsxM29nAi4rIsP/khPLiRMxEDXVpkmTlQk+OR7JjMDg
- BfHnVTlxOFT6A5OpwzBrYYL35BcSqSyjkuy8kXuT5fDGA2QNaDsE5uLyWi0ZnzIzwUsijdcEx1AL+HQa
- QyeA/kr+M3c1BPqyQD0LFUHwCchlMtBdAnvPwH0JCKWqKhgY0aFb048uTZ9CRXAQfUA4fAHvI3D8AdzW
- EjScVI0ftIpzAYjIfaBrIp9Na3uwb2pvPuZMLieoMY51ohAhiG8SbBs7/ilRlantJYj5CbizFgXURSWU
- liqo7tk3bGHWG43QzHIAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
</value>
</data>
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHMSURBVDhPjZI5SANBFIYX7CNWClEbC+0E7UXEQq0UK4+I
- oPGOd/DCeMQDDzxBESstLAQPBJuonQQbj0axFFQIeEaTzWazye++WbPJukEd+Blm5r3v/W9mOC5qjC2s
- gzQ6twbbzCoGp1diis76J5YRncvRBo2ppXU2/2doIGEAJVY1dkOSZ68Yiik+oOCbrEMRFz32ebVocbkZ
- paZ6lFSadaL9spoWVDV0oNbSEwF0D88ygBQM/em+b3xR2z9dRqdtmiX6RQkXN3e4uo2I1mJAguBXvFOs
- 5gJp0d4/yQ55QYQoBZmTsAJSSAGICoBidYDWXjs79PpEnJ7fwHl5q8r19KZrSwdoto6wILdXAO+X4AsE
- VdE+Z+K0+klo6LIxwLtHgOP0AsfOK9y7ntXKBJAxTAz2c9S1D7Dglw8en3IbHoF+grYyJSfvpMZ2Ym7r
- YwnPbh77R04cnJypgHBlmjP2jEh3pEWcVMsfoqLGguomK0twvXoY5MXt0wDiNhJg2DQgacsA43Y8EncT
- FCeVtRbQ1yEAmX54+sDjt1gLBXJQrtJ38XUOsg6NSmK+rEJZRaUmtbruraI2wpeY6UjRX2J6dg5+k+ok
- L6ry9yt8Ae9ue03yyMc9AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="Out.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHMSURBVDhPjZI5SANBFIYX7CNWClEbC+0E7UXEQq0UK4+I
- oPGOd/DCeMQDDzxBESstLAQPBJuonQQbj0axFFQIeEaTzWazye++WbPJukEd+Blm5r3v/W9mOC5qjC2s
- gzQ6twbbzCoGp1diis76J5YRncvRBo2ppXU2/2doIGEAJVY1dkOSZ68Yiik+oOCbrEMRFz32ebVocbkZ
- paZ6lFSadaL9spoWVDV0oNbSEwF0D88ygBQM/em+b3xR2z9dRqdtmiX6RQkXN3e4uo2I1mJAguBXvFOs
- 5gJp0d4/yQ55QYQoBZmTsAJSSAGICoBidYDWXjs79PpEnJ7fwHl5q8r19KZrSwdoto6wILdXAO+X4AsE
- VdE+Z+K0+klo6LIxwLtHgOP0AsfOK9y7ntXKBJAxTAz2c9S1D7Dglw8en3IbHoF+grYyJSfvpMZ2Ym7r
- YwnPbh77R04cnJypgHBlmjP2jEh3pEWcVMsfoqLGguomK0twvXoY5MXt0wDiNhJg2DQgacsA43Y8EncT
- FCeVtRbQ1yEAmX54+sDjt1gLBXJQrtJ38XUOsg6NSmK+rEJZRaUmtbruraI2wpeY6UjRX2J6dg5+k+ok
- L6ry9yt8Ae9ue03yyMc9AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADHSURBVDhPpZLNDcMgDIXZiZEiZQJzTs/JuZEiVUpGYYDs
- 9IoRppSfhrYRFgLlfdh+VqryaT2iN2p6xWJjCNN0w7zMWO8rjn2H+xnD8ABwujX6cxNAAbA4QC48Nw2O
- AsAvM9FnQNQUVgFBHAEUAJyuCPI9ZsBiV5V/MW0eny8BImZAHt2AjZv6KyDYAIaEmt52KcFaC460D7kL
- 0ZbUBQEI/BOAk3nZ6OagqwetUSYy/wEk5ZaNSb+q0yyXxRz0CgvAt8IIuBI+AZInmNFWdMJxAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
</value>
</data>
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -446,7 +406,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -485,7 +445,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -525,7 +485,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -564,7 +524,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -604,7 +564,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -643,7 +603,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -683,7 +643,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -722,7 +682,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -762,7 +722,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C////////////////////////////////////////////////////////////////////////
+ //////8A////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -801,7 +761,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av//////////////////////////////////
+ ////////////////////////////////////////////AP//////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -841,7 +801,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL/////////////////////////////////////////////////////////////////////////////
+ /wD/////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -880,7 +840,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C////////////////////////////////////////
+ //////////////////////////////////////8A////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -919,7 +879,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -959,7 +919,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -998,7 +958,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1038,7 +998,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1077,7 +1037,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1117,7 +1077,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1156,7 +1116,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1196,7 +1156,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1235,7 +1195,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1275,7 +1235,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1314,7 +1274,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1354,7 +1314,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C////////////////////////////////////////////////////////////////////////
+ //////8A////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1393,7 +1353,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av//////////////////////////////////
+ ////////////////////////////////////////////AP//////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1433,7 +1393,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL/////////////////////////////////////////////////////////////////////////////
+ /wD/////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1472,7 +1432,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C////////////////////////////////////////
+ //////////////////////////////////////8A////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1511,7 +1471,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1551,7 +1511,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1590,7 +1550,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1630,7 +1590,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1669,7 +1629,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1709,7 +1669,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1748,7 +1708,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1788,7 +1748,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1827,7 +1787,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1867,7 +1827,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1906,7 +1866,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1946,7 +1906,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/////////////////////v7+/v7+/v7+/f39/f39/Pz8/Pz8/Pz8+/v7+/v7+/v7+/v7+/v7
+ //////8A/////////////////////v7+/v7+/v7+/f39/f39/Pz8/Pz8/Pz8+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
@@ -1985,7 +1945,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av////////////////7+/v7+/v39/fz8/Pr6
+ ////////////////////////////////////////////AP////////////////7+/v7+/v39/fz8/Pr6
+vn5+ff39/b29vX19fT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
@@ -2025,7 +1985,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL////////////////+/v79/f37+/v5+fn29vby8vLv7+/t7e3r6+vq6urq6urq6urq6urq6urq6urq
+ /wD////////////////+/v79/f37+/v5+fn29vby8vLv7+/t7e3r6+vq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
@@ -2064,7 +2024,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/////////////////v7+/Pz8+fn59fX18PDw6urq
+ //////////////////////////////////////8A/////////////////v7+/Pz8+fn59fX18PDw6urq
5eXl4eHh3t7e3Nzc29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
@@ -2103,7 +2063,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
//////////////39/fr6+vb29vDw8Onp6eDg4NjY2NLS0s7OzsvLy8rKysrKysrKysrKysrKysrKysrK
ysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK
ysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK
@@ -2143,7 +2103,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL////////////////9/f35+fny8vLq6urg4ODT09PJycnB
+ /////////////////////////////////wD////////////////9/f35+fny8vLq6urg4ODT09PJycnB
wcG7u7u2tra0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
@@ -2182,7 +2142,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
/////////Pz89/f37+/v5eXl2NjYycnJvLy8srKyqqqqpaWlo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
o6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
o6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
@@ -2222,7 +2182,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av////////////////z8/Pb29u3t7eHh4dLS0sHBwbKysqampp2d
+ ////////////////////////////AP////////////////z8/Pb29u3t7eHh4dLS0sHBwbKysqampp2d
nZeXl5WVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
lZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
lZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
@@ -2261,7 +2221,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL+/v7+/v7+/v7+
+ /////////////////////////////////////////////////////////////////wD+/v7+/v7+/v7+
/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW0snW08rW08rY1s3Y1s3X1MvZ18/c
2tLe3NTq6OPw7urx7+vx7+vx7+vy8e7v7enw7urx7+vy8Ozv7enx7+ve3NTZ18/m5N7w7urw7urx7+vx
7+vu7Ojw7urv7ens6+fv7ens6+fv7ens6uXi4Nnd29Pe3NTZ18/W08rW0snT0MbSz8XSz8XU0cjV0cjS
@@ -2301,7 +2261,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1dHI1dHI
+ //////////////////////8A/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1dHI1dHI
1tLJ1tLJ1tLJ1tPK19TL1tPK2NbN19TL2NXM2tjQ29nR5OLb7+3p8O7q8O7q8e/r8vHu7+3p8O7q8e/r
8O7q8vDs8O7q7uzo8e/r8vDs7+3p8O7q7+3p7Ovn7Ovn7Ovn7+3p7uzo6ujj5+Xg4uDZ3tzU2NbN1tLJ
1NHI09DG09DG09DG0s/F0s/F0s/F09DG1dHI09DGz8zBxsG2yMO40s/F09DG2NbN3NrS3tzU4uDZ5eTe
@@ -2340,7 +2300,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av7+/v7+/v7+/v7+/tXR
+ ////////////////////////////////////////////////////////////AP7+/v7+/v7+/v7+/tXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbSydbTytfUy9jVzNbTytnXz9vZ0dnX
z9/d1e/t6e/t6fDu6vDu6vHv6/Hv6+/t6fDu6vDu6vHv6+/t6fLw7PLw7O7s6O/t6fDu6u/t6ezr5+7s
6Ojm4ePh2uDe19rY0NjWzdnXz9bTytXRyNTRyNPQxtPQxtLPxdLOw9DNwtLPxdLOw9LOw9LOw9PQxtXR
@@ -2380,7 +2340,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL+/v7+/v7+/v7+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW
+ /////////////////wD+/v7+/v7+/v7+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW
0snW0snW0snW08rX1MvW08rY1s3X1Mva2NDb2dHg3tfu7Ojv7enw7urw7urx7+vx7+vv7enw7urx7+vw
7ury8Ozx7+vu7Ojy8Ozw7urs6+fq6OPj4drd29PZ18/Z18/Z18/Y1czY1czY1s3W0snW0snV0cjT0MbT
0MbSzsPQzcLSz8XT0MbT0MbV0cjW08rc2tLi4Nnn5eDm5N7n5eDl5N7h39ja2NDa2NDZ18/LyL3d29Pj
@@ -2419,7 +2379,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/v7+/v7+/v7+/v7+1dHI1dHI
+ //////////////////////////////////////////////////////8A/v7+/v7+/v7+/v7+1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK19TL1tPK2NXM19TL2NXM2NbN393V
7Ovn7uzo7+3p8e/r8e/r8e/r7uzo7uzo8O7q8O7q8O7q7Ovn7Orl6Obh4uDZ393V1tPK0s/F0M3C1NHI
2NbN2NXM2NXM1tLJ1tLJ1tLJ1tLJ1NHI09DG1NHI09DG1dHI2NXM2tjQ3dvT5OLb5+Xg5+Xg5+Xg4uDZ
@@ -2459,7 +2419,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av7+/v7+/v7+/v7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbS
+ ////////////AP7+/v7+/v7+/v7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbS
ydbSydbTytbTytbTytbTytjWzdnXz9fUy9nXz+jm4e/t6e/t6fDu6vHv6/Hv6+7s6O7s6PHv6+ro4+Xj
3N3b09nXz9TRyNPQxs7LwMfCt8S/tMbBttLPxdjVzNbSydXRyNTRyNPQxtXRyNXRyNXRyNjWzdrY0N/d
1eTi2+fl4Ofl4Obk3uXk3uXk3uXj3OXk3tvZ0c3Kv8jDuMfCt9LOw9rY0M7LwM7LwNrY0NvZ0ePh2uLg
@@ -2498,7 +2458,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL+/v7+/v7+/v7+/v7V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD+/v7+/v7+/v7+/v7V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjW0snV0cjV0cjW0snW0snW08rV0cjX1MvW08rY1czY1s3Y1czY1s3k4tvu
7Oju7Ojv7enx7+vw7urv7ens6+fq6OPd29PZ18/PzMHNyr/Kx7vKx7vFwLXEv7S+ua3DvbHOy8DW0snV
0cjT0MbU0cjY1s3c2tLg3tfl49zn5eDn5eDn5eDo5uHj4drk4tvo5uHk4tvl5N7l5N7l5N7Z18/Iw7jW
@@ -2538,7 +2498,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1dHI1tLJ
+ //////8A/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1dHI1tLJ
1tPK1dHI1tLJ19TL2NXM2NbN2NXM2dfP4d/Y7Ovn7Orl7+3p8e/r8e/r7+3p7Ovn4+Ha2NXM2NXMysW6
y8i9xsG2x8K3zMm+zcq/yMO4ysW60s7D1tPK2dfP2dfP4d/Y5eTe6ujj6ujj6ujj5eTe4uDZ4d/Y393V
09DG2dfP5+Xg5eTe5eTe4+Ha5OLb3dvT1tPK4+Ha4N7X5OLb4+Ha5OLb4uDZ4uDZ4d/Y4N7X4+Ha4uDZ
@@ -2577,7 +2537,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av7+/f7+/v7+/v7+/tXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP7+/f7+/v7+/v7+/tXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytbSydbSydbTytjVzNjWzdfUy9jWzd/d1ezq5ezr
5+/t6fDu6vDu6u7s6Ozr59/d1dbTytbSycrHu8bBtsnEuczJvtXRyNbTytnXz9/d1ePh2uXj3Obk3ufl
4Ojm4ero4+Xk3t/d1dza0tPQxtbTytnXz9LPxc/MwdbTyuTi2+Ti2+Xj3OPh2uPh2uPh2uTi2+Lg2eLg
@@ -2617,7 +2577,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL+/v3+/v3+/v3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW
+ /wD+/v3+/v3+/v3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW
0snW0snW08rX1MvY1s3X1MvZ18/c2tLp5+Lu7Ojs6+fv7enw7uru7Ojs6+fk4tvZ18/U0cjOy8DSzsPW
0sna2NDf3dXl5N7n5eDq6OPq6OPo5uHn5eDn5eDm5N7l5N7n5eDY1czOy8DLyL3c2tLY1s3Oy8DZ18/b
2dHk4tvj4drk4tvj4drj4drj4dri4Nni4Nni4Nni4Nni4Nnj4drl49zk4tvl49zl49zj4drj4drh39jg
@@ -2656,7 +2616,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/v7+/v79/v79/v7+1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////////////////////8A/v7+/v79/v79/v7+1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tPK19TL19TL2NXM19TL2dfP2dfP5+Xg7uzo7uzo
7uzo8O7q7uzo7Orl7Orl4+Ha3dvT3NrS4uDZ5eTe6ujj6ujj6ujj6ujj6ujj6ujj6Obh5+Xg5+Xg5uTe
5+Xg5ePc09DG09DG1NHI3NrS3dvT4N7X5OLb4d/Y4+Ha4uDZ4+Ha4uDZ4uDZ4uDZ4+Ha4+Ha4+Ha4uDZ
@@ -2695,7 +2655,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av7+
+ ////////////////////////////////////////////////////////////////////////////AP7+
/f7+/f7+/f7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbT
ytfUy9bTytfUy9fUy9nXz9jWzeTi2+7s6O7s6O7s6PDu6u7s6Oro4+ro4+zq5ezq5ero4+zr5+ro4+zq
5ero4+jm4efl4Ofl4Obk3uXk3uXk3uXk3uXk3uXk3uXk3uLg2eLg2ePh2uXk3uTi2+Ti2+Ph2uLg2eLg
@@ -2735,7 +2695,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL+/v39/f3+/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////////////////////wD+/v39/f3+/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjW0snW0snW0snW0snW08rX1MvW08rX1MvY1s3a2NDY1cze3NTq6OPs6+fs6uXu
7Ojv7enp5+Lp5+Lq6OPs6uXq6OPq6OPo5uHo5uHo5uHo5uHn5eDn5eDm5N7l5N7l5N7l5N7l49zm5N7l
5N7l5N7k4tvk4tvj4dri4Nni4Nni4Nnj4drj4drj4drk4tvk4tvk4tvh39jd29Pe3NTi4Nnj4drh39jg
@@ -2774,7 +2734,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C/v39/f39
+ //////////////////////////////////////////////////////////////////////8A/v39/f39
/f39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1tLJ1tLJ1tPK19TL
1tPK19TL2NbN2tjQ2NbN3NrS6efi7Orl7Orl7Ovn7uzo6efi6ujj6Obh6Obh5uTe5+Xg6Obh5uTe6Obh
5eTe5eTe5eTe5eTe5ePc5eTe5eTe5OLb4uDZ5eTe4uDZ5ePc4+Ha4+Ha5OLb5OLb5ePc5OLb5OLb5ePc
@@ -2814,7 +2774,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av39/f79/f7+/f7+/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////////////////////AP39/f79/f7+/f7+/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytfUy9bTytjVzNjWzdnXz9jWzdza0unn4unn4uzq5ero4+zq
5enn4ufl4Ofl4OXk3uXk3uXk3uXk3uTi2+Xk3ubk3uXk3uXj3OTi2+Ph2uPh2uPh2uPh2uXk3uPh2uTi
2+Xk3uXk3ujm4ePh2uTi2+Hf2OPh2uLg2ePh2uHf2OHf2OLg2drY0NjVzNrY0ODe1+De197c1ODe197c
@@ -2853,7 +2813,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL+/v39/f39/f3+
+ /////////////////////////////////////////////////////////////////wD+/v39/f39/f3+
/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW0snW08rW08rX
1MvY1czZ18/Y1s3c2tLp5+Ln5eDp5+Lq6OPp5+Lp5+Ll5N7n5eDk4tvl49zl49zk4tvk4tvl49zl5N7k
4tvj4drj4dri4Nnj4drk4tvk4tvm5N7l49zo5uHk4tvk4tvk4tvk4tvb2dHa2NDj4dri4Nni4Nni4Nng
@@ -2893,7 +2853,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/v39/f39/f39/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////8A/v39/f39/f39/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1tLJ1dHI1tLJ1tLJ1tPK1tPK1tPK2NXM2NbN2NXM2dfP29nR5uTe6Obh6Obh5uTe6efi6efi
5eTe5OLb5OLb4+Ha5OLb4uDZ4+Ha4+Ha4uDZ5eTe4uDZ4+Ha5ePc5OLb5eTe5OLb5OLb4+Ha4+Ha4+Ha
4+Ha5OLb4uDZ2dfP2dfP4uDZ4N7X4uDZ4d/Y3dvT4N7X3dvT3dvT1tPK1tLJyMO4yse7vrmtzMm+ubSm
@@ -2932,7 +2892,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av79/f7+/f39/f7+/dXR
+ ////////////////////////////////////////////////////////////AP79/f7+/f39/f7+/dXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydXRyNbSydbSydbSydbTytfUy9jVzNfU
y9fUy9nXz9vZ0eXk3ufl4Ojm4ebk3ufl4Ofl4OPh2uLg2eXk3uPh2uLg2ePh2uPh2uPh2uTi2+Xj3OXk
3uTi2+Xk3uTi2+Xj3NnXz9jVzOPh2uPh2uDe1+Ti2+Hf2ODe1+Hf2ODe197c1ODe197c1Nza0t/d1dPQ
@@ -2972,7 +2932,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL+/f3+/v39/f3+/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////wD+/f3+/v39/f3+/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjW0snW0snW0snW08rX1MvY1s3X1MvX1MvY1czZ18/j4drm5N7n5eDl5N7l5N7l5N7j4drh
39ji4Nng3tfi4Nnj4drl49zm5N7l5N7j4drk4tvj4drk4tvh39jj4drW08rW0sni4Nng3tfh39jh39jh
39jg3tfe3NTe3NTZ18/Z18/f3dXDvrPT0MbSzsO6tqre3NTSzsOyrJ7KxbrHwrehm4vMyb64s6XKxbrL
@@ -3011,7 +2971,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/f39/f39/f39/v391dHI1dHI
+ //////////////////////////////////////////////////////8A/f39/f39/f39/v391dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK2NbN2NbN19TL
2NXM2dfP4d/Y5ePc5ePc4+Ha4+Ha5ePc4d/Y4N7X3tzU4uDZ5OLb4+Ha4+Ha2dfP2NbN4uDZ4uDZ4d/Y
4d/Y4N7X4d/Y3NrS3NrS4N7X4N7X4d/Y3NrS2NbN2dfP2NXMycS5zMm+zcq/0M3CubSmzsvA1dHIuLOl
@@ -3051,7 +3011,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av79/f7+/f7+/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbS
+ ////////////AP79/f7+/f7+/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbS
ydXRyNbSydbSydbSydbSydbTytjWzdjWzdfUy9nXz9nXz9/d1eXj3OTi2+Lg2eLg2ePh2t/d1d3b0+De
1+Ph2uLg2ePh2uLg2dLOw87LwODe1+Hf2ODe193b097c1NvZ0d/d1d/d1dza0tza0tnXz8jDuM3Kv8XA
tcXAtb65rdLOw8XAtcO+s9DNwsbBtsrHu7WwosXAtcnEucvIvdTRyNTRyNXRyNPQxtXRyNTRyNLOw9LO
@@ -3090,7 +3050,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL+/v3+/f3+/v39/f3V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD+/v3+/f3+/v39/f3V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW08rY1czY1czY1cza2NDZ
18/d29Pj4dri4Nni4Nnh39ji4Nne3NTb2dHg3tfh39jh39ji4Nng3tfa2NDd29Pd29Pc2tLf3dXd29PZ
18/a2NDb2dHKx7vKx7vf3dXGwbbDvrPb2dHJxLm0r6G7t6vKxbqup5jLyL3SzsPDvrPHwrfPzMHSz8XT
@@ -3130,7 +3090,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/v79/v79/v79/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////8A/v79/v79/v79/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1tLJ1tLJ1tPK1tPK1tPK19TL19TL2NbN29nR2NbN2tjQ4+Ha4N7X4d/Y393V4N7X3dvT2tjQ393V393V
4N7X3tzU3NrS4N7X393V3NrS3NrSyse7y8i9w76z0s7D2tjQxL+0vrmty8i9t7Kkw72x1dHIwrywvbmt
vrmtycS5yMO41NHI0s7D09DG1NHI09DG0s/F0M3CzsvAzcq/y8i9zMm+zMm+zMm+zcq/zcq/z8zB0s7D
@@ -3169,7 +3129,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av39/f7+/f39/f39/dXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP39/f7+/f39/f39/dXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytbTytbTytfUy9fUy9jVzNza0tjWzdvZ
0ePh2t/d1d7c1Nza0t7c1Nza0tnXz9za0t7c1NvZ0d3b093b09XRyMrHu9nXz9jWza+omcrFur65rcO+
s8bBtsO+s7u3q7u3q765rcK8sMbBtsjDuNPQxtLOw9LOw9PQxtDNwtLPxc/MwczJvs3Kv8rHu8rHu8vI
@@ -3209,7 +3169,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL+/f3+/v39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW
+ /wD+/f3+/v39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW
0snW08rX1MvX1MvW08rW08rY1czc2tLZ18/b2dHh39jd29Pe3NTb2dHd29PZ18/Y1czZ18/Z18/Z18/Z
18/Y1s3T0Ma9ua3Iw7jBu6+tppfV0ci6tae7t6u3sqTAuq66tafGwbbT0MbSzsPSz8XT0MbSzsPSz8XP
zMHMyb7LyL3Myb7LyL3LyL3LyL3Myb7Nyr/Oy8DNyr/Myb7Nyr/Nyr/Myb7Nyr/Nyr/Oy8DOy8DPzMHP
@@ -3248,7 +3208,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/v79/v79/v39/f391dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////////////////////8A/v79/v79/v39/f391dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK1tPK19TL19TL19TL2dfP2NbN29nR393V
2dfP2dfP2dfP2dfP1tLJ1NHI1tLJ1tPK1tLJ1tLJ1tPK1tLJysW6uraqtK6gvrmt09DGw72xwrywyse7
zsvAzsvA0s/F0M3Czcq/zsvAzcq/y8i9zMm+y8i9y8i9y8i9zMm+zMm+zcq/zsvAzcq/zMm+zMm+zMm+
@@ -3287,7 +3247,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av79
+ ////////////////////////////////////////////////////////////////////////////AP79
/f39/f79/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbS
ydbTytfUy9fUy9jVzNfUy9jWzdjVzNrY0N7c1NbTytbSydXRyNXRyNPQxtLOw9PQxtPQxtLPxdLPxdTR
yNXRyNbSycK8sJ+ZicrHu9PQxtLOw9LOw9LOw8zJvs7LwMzJvsvIvcvIvcvIvcvIvcvIvc3Kv83Kv83K
@@ -3327,7 +3287,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL9/f39/f39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////////////////////wD9/f39/f39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW08rX1MvY1czY1czZ18/Y1czY1s3c2tLV0cjT
0MbSz8XT0MbPzMHMyb7PzMHSzsPSzsPSzsPSz8XSz8XT0MbOy8DEv7TSzsPNyr/Nyr/Myb7LyL3LyL3L
yL3Kx7vLyL3Nyr/Nyr/Nyr/PzMHLyL3Myb7LyL3LyL3LyL3LyL3LyL3Kx7vOy8DNyr/SzsPQzcLT0MbW
@@ -3366,7 +3326,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C/f39/f39
+ //////////////////////////////////////////////////////////////////////8A/f39/f39
/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tPK
1tPK1tPK2NXM2NXM2dfP2NXM2tjQ3NrS09DG0s7D0s7D0M3CzMm+ysW6yse7zMm+zsvAz8zB0M3Cz8zB
0s/F0M3Cz8zBy8i9yse7yse7ysW6ysW6zMm+y8i9zMm+zcq/zcq/zcq/zcq/zcq/y8i9zMm+zMm+zMm+
@@ -3406,7 +3366,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av39/P39/f39/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////////////////////AP39/P39/f39/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbTytbTytfUy9jWzdjWzdjVzNvZ0dvZ0dLOw9DNws/M
wc3Kv8zJvsjDuMjDuMrFusrHu8rHu8vIvcvIvcvIvczJvsvIvcvIvcvIvcvIvcrHu8vIvcrHu8zJvsvI
vczJvszJvszJvszJvszJvs7LwNDNwtPQxtPQxtXRyNXRyNTRyNPQxtbSydPQxtTRyNTRyNPQxtPQxtPQ
@@ -3445,7 +3405,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL9/fz9/f39/f39
+ /////////////////////////////////////////////////////////////////wD9/fz9/f39/f39
/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW
08rX1MvY1s3Y1czY1cza2NDa2NDOy8DNyr/Oy8DMyb7LyL3Iw7jIw7jIw7jIw7jIw7jKx7vKx7vLyL3L
yL3Oy8DMyb7Nyr/LyL3LyL3Kx7vKx7vMyb7Kx7vMyb7PzMHPzMHQzcLSz8XU0cjU0cjU0cjT0MbT0MbT
@@ -3485,7 +3445,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/f38/f38/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////8A/f38/f38/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tPK1tPK19TL19TL2NbN19TL2NXM2NbNzsvAzMm+zcq/zcq/
yse7yMO4yMO4ysW6yse7y8i9zcq/zcq/y8i9zMm+zMm+zMm+ysW6y8i9y8i9y8i9zsvA0s7D09DG1dHI
19TL1tLJ1tLJ09DG1NHI1NHI1NHI09DG09DG09DG09DG09DG09DG1NHI09DG09DG1NHI09DG09DG09DG
@@ -3524,7 +3484,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av39/P39/P39/f39/dXR
+ ////////////////////////////////////////////////////////////AP39/P39/P39/f39/dXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbTytfU
y9bTytfUy9fUy9jVzNfUy83Kv83Kv8zJvsvIvczJvsrHu8vIvczJvszJvszJvszJvs3Kv8zJvsvIvczJ
vs/MwdDNwtLPxdTRyNbSydbSydXRyNbSydbSydXRyNTRyNTRyNTRyNTRyNTRyNPQxtPQxtLPxdPQxtPQ
@@ -3564,7 +3524,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL9/fz9/fz9/fz9/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////wD9/fz9/fz9/fz9/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rX1MvW0snW0snX1MvW08rW0snNyr/Myb7Myb7JxLnKx7vL
yL3Kx7vKx7vLyL3Myb7Nyr/PzMHT0MbT0MbU0cjW0snW0snW0snY1czY1czV0cjV0cjU0cjV0cjU0cjT
0MbU0cjU0cjU0cjT0MbT0MbT0MbT0MbSzsPT0MbU0cjU0cjSz8XSz8XU0cjT0MbU0cjT0MbT0MbU0cjU
@@ -3603,7 +3563,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/f38/f38/f39/f391dHI1dHI
+ //////////////////////////////////////////////////////8A/f38/f38/f39/f391dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tPK1tLJ
1dHI19TL2NXM1tLJzcq/yse7zMm+yse7yse7zcq/zsvA0M3C09DG1NHI1NHI19TL1tLJ1tLJ1tLJ1dHI
1NHI1NHI1tLJ1tLJ1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI09DG09DG1NHI09DG0s/F0s/F1NHI
@@ -3643,7 +3603,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av39/P39/P39/f79/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////AP39/P39/P39/f79/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydXRyNXRyNXRyNfUy9PQxsvIvc3Kv83Kv8/MwdPQxtTRyNXR
yNbSydfUy9fUy9TRyNXRyNXRyNTRyNbSydTRyNTRyNTRyNTRyNTRyNPQxtTRyNTRyNTRyNTRyNPQxtPQ
xtTRyNTRyNTRyNTRyNTRyNTRyNPQxtPQxtPQxtPQxtPQxtTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
@@ -3682,7 +3642,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL9/fz9/fz9/f39/f3V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD9/fz9/fz9/f39/f3V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snV0cjV0cjV0cjW0snV
0cjV0cjT0MbSz8XU0cjU0cjW0snX1MvW0snW0snW0snW0snW0snU0cjU0cjV0cjU0cjV0cjV0cjV0cjU
0cjU0cjSz8XT0MbU0cjU0cjU0cjT0MbT0MbT0MbU0cjU0cjT0MbT0MbU0cjU0cjT0MbT0MbU0cjT0MbU
@@ -3722,7 +3682,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/f38/f39/v39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////8A/f38/f39/v39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1NHI1dHI1tLJ1tLJ1tLJ1NHI1tLJ1NHI1dHI1dHI
1dHI1dHI1dHI1NHI1NHI1NHI1NHI1NHI1NHI1dHI1NHI1NHI09DG1NHI1NHI1NHI09DG09DG1NHI1NHI
1NHI1NHI1NHI1NHI1NHI09DG1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1dHI1NHI1NHI1NHI
@@ -3761,7 +3721,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av38/P39/f79/f7+/dXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP38/P39/f79/f7+/dXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNTR
yNTRyNXRyNTRyNXRyNTRyNTRyNTRyNTRyNXRyNXRyNXRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
yNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
@@ -3801,7 +3761,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL9/fz9/f39/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /wD9/fz9/f39/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjU0cjU0cjV0cjV0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU
0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU
0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjV0cjU0cjU0cjU0cjU0cjU0cjV0cjV0cjV0cjV0cjV
@@ -3840,7 +3800,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/////////////////v7+/v7+/f39/Pz8+vr6+fn5
+ //////////////////////////////////////8A/////////////////v7+/v7+/f39/Pz8+vr6+fn5
9/f39vb29fX19PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
@@ -3879,7 +3839,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
//////////////////7+/v7+/v7+/v39/f39/fz8/Pz8/Pz8/Pv7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
@@ -3919,7 +3879,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -3958,7 +3918,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C
+ //////////////////////////////////////////////////////////////////////8A
</value>
</data>
<data name="cmdHDataInTmp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3991,10 +3951,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>344, 21</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>78</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 5d42bac..b07aec0 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -71,7 +71,7 @@
",HWWOrderInterID=" + omodel.HWWOrderInterID.ToString() +
",HWWOrderEntryID=" + omodel.HWWOrderEntryID.ToString() +
",HWWOrderBillNo='" + omodel.HWWOrderBillNo + "'" +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HMaterID2=" + omodel.HMaterID2.ToString() +
@@ -270,7 +270,7 @@
",HProdMaterCode,HSeOrderBillNo,HCusShortName,HCusNeedMaterial,HPlanSendGoodsDate" +
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
- ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD" +
+ ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -281,7 +281,7 @@
",'" + omodel.HProdMaterCode + "','" + omodel.HSeOrderBillNo + "','" + omodel.HCusShortName + "','" + omodel.HCusNeedMaterial + "','" + omodel.HPlanSendGoodsDate + "'" +
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
- ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'" +
+ ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -407,6 +407,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -432,6 +433,12 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
+ //===============
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//
//寰幆
DataSet DsSub;
@@ -509,6 +516,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
@@ -598,6 +607,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -630,7 +640,30 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
- //
+
+ omodel.HProdMaterCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterCode"]);
+ omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]);
+ omodel.HCusShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusShortName"]);
+ omodel.HCusNeedMaterial = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNeedMaterial"]);
+ omodel.HPlanSendGoodsDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanSendGoodsDate"]);
+ omodel.HProdMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterName"]);
+ omodel.HCusName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusName"]);
+ omodel.HWorkRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HWorkRemark"]);
+ omodel.HImportNote = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HImportNote"]);
+ omodel.HMaterNumber_A = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_A"]);
+ omodel.HMaterNumber_B = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_B"]);
+ omodel.HMaterNumber_C = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_C"]);
+ omodel.HMaterNumber_D = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_D"]);
+ omodel.HProdType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdType"]);
+ omodel.HMaterShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterShortName"]);
+ omodel.HMaterIDA = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDA"]);
+ omodel.HMaterIDB = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDB"]);
+ omodel.HMaterIDC = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDC"]);
+ omodel.HMaterIDD = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDD"]);
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -722,6 +755,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
@@ -779,6 +814,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index a04535a..60611bd 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -59,5 +59,10 @@
public string HMaterIDB;
public string HMaterIDC;
public string HMaterIDD;
+ public string HPicNumVer;//图号版本
+ public string HPicNumAssemble;//总装图号
+ public string HMaterTexture;//材质
+ public string HProductNum;//成品编号
+ public string HVerNum;//版本
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 1f7b77c..924e656 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -68,5 +68,7 @@
public string HProcCheckNote;
public string HPicNum;
public string HTechnologyParameter;
+ public string HMouldNo;//模具编号
+ public string HProcWorkNum;//程序号
}
}
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
index aebe558..3488207 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
@@ -10,7 +10,7 @@
namespace PlanM
{
- public partial class Gy_DataIn_RoutingBill :BLL.Gy_DataInTmp
+ public partial class Gy_DataIn_RoutingBill : BLL.Gy_DataInTmp
{
public Gy_DataIn_RoutingBill()
{
@@ -21,7 +21,7 @@
public int HProcNoCol = 0; //工序序号
public int HProcNameCol = 0; //工序
public int HWorkCenterNameCol = 0; //工作中心
- public int HWorkQtyCol = 0; //产能
+ public int HWorkQtyCol = 0; //加工数量
public int HBeginDayQtyCol = 6; //开工固天
public int HBeginFixQtyCol = 7; //开工余量
public int HFixPriceCol = 8; //定额 小时工资
@@ -37,6 +37,7 @@
public int HVerNumCol = 0; //版本
public int HMouldNoCol = 0; //模具编号
public int HProcWorkNumCol = 0; //程序号
+ public int HPassRateCol = 0; //良率
//
public const int HBeginRow = 2; //有效数据，开始行数
//
@@ -53,7 +54,7 @@
{
base.sSheetName = txtHSheetName.Text;
return base.OpenExcelData();
- }
+ }
/// <summary>
/// 初始化界面
@@ -61,7 +62,7 @@
public override void initData()
{
base.initData();
- base.sSheetName = txtHSheetName.Text ;
+ base.sSheetName = txtHSheetName.Text;
base.ModRightName = "Gy_DataIn_RoutingBill";
base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
@@ -80,307 +81,330 @@
//导入
public override void Sub_DataIn()
{
- string hnumber = "";
- string HBillNo = "";
- //
- HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("产品代码", grdMain);
- HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
- HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工作中心", grdMain);
- HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("产能", grdMain);
- HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
- HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
- HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
- HPicNumVerCol = DBUtility.Gy_BaseFun.Fun_GetCol("图号版本", grdMain);
- HPicNumAssembleCol = DBUtility.Gy_BaseFun.Fun_GetCol("总装图号", grdMain);
- HMaterTextureCol = DBUtility.Gy_BaseFun.Fun_GetCol("材质", grdMain);
- HProductNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("成品编号", grdMain);
- HVerNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("版本", grdMain);
- HMouldNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("模具编号", grdMain);
- HProcWorkNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("程序号", grdMain);
- HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工余量", grdMain);
- HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工固天", grdMain);
- HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("小时工资", grdMain);
- HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("单个工价", grdMain);
+ try
+ {
+ string hnumber = "";
+ string HBillNo = "";
+ //
+ HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("产品代码", grdMain);
+ HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
+ HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
+ HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工作中心", grdMain);
+ HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("加工数量", grdMain);
+ HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
+ HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
+ HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
+ HPicNumVerCol = DBUtility.Gy_BaseFun.Fun_GetCol("图号版本", grdMain);
+ HPicNumAssembleCol = DBUtility.Gy_BaseFun.Fun_GetCol("总装图号", grdMain);
+ HMaterTextureCol = DBUtility.Gy_BaseFun.Fun_GetCol("材质", grdMain);
+ HProductNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("成品编号", grdMain);
+ HVerNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("版本", grdMain);
+ HMouldNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("模具编号", grdMain);
+ HProcWorkNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("程序号", grdMain);
+ HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工余量", grdMain);
+ HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工固天", grdMain);
+ HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("小时工资", grdMain);
+ HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("单个工价", grdMain);
+ HPassRateCol = DBUtility.Gy_BaseFun.Fun_GetCol("良率", grdMain);
- //没有找到列
- if (HMaterNumberCol == -1)
- {
- MessageBox.Show("没有找到【产品代码】的标题", "提示");
- return;
- }
- if (HProcNameCol == -1)
- {
- MessageBox.Show("没有找到【工序】的标题", "提示");
- return;
- }
- if (HWorkCenterNameCol == -1)
- {
- MessageBox.Show("没有找到【工作中心】的标题", "提示");
- return;
- }
- if (HWorkQtyCol == -1)
- {
- MessageBox.Show("没有找到【产能】的标题", "提示");
- return;
- }
- if (HBeginFixQtyCol == -1)
- {
- MessageBox.Show("没有找到【开工余量】的标题", "提示");
- return;
- }
- if (HBeginDayQtyCol == -1)
- {
- MessageBox.Show("没有找到【开工固天】的标题", "提示");
- return;
- }
- if (HFixPriceCol == -1)
- {
- MessageBox.Show("没有找到【小时工资】的标题", "提示");
- return;
- }
- if (HProcPriceCol == -1)
- {
- MessageBox.Show("没有找到【单个工价】的标题", "提示");
- return;
- }
- if (HProcNoCol == -1)
- {
- MessageBox.Show("没有找到【工序序号】的标题", "提示");
- return;
- }
- if (HTechnologyParameterCol == -1)
- {
- MessageBox.Show("没有找到【工艺参数】的标题", "提示");
- return;
- }
- if (HPicNumCol == -1)
- {
- MessageBox.Show("没有找到【图纸编号】的标题", "提示");
- return;
- }
- if (HProcCheckNoteCol == -1)
- {
- MessageBox.Show("没有找到【本工序确认记录】的标题", "提示");
- return;
- }
- if (HPicNumVerCol == -1)
- {
- MessageBox.Show("没有找到【图号版本】的标题", "提示");
- return;
- }
- if (HPicNumAssembleCol == -1)
- {
- MessageBox.Show("没有找到【总装图号】的标题", "提示");
- return;
- }
- if (HMaterTextureCol == -1)
- {
- MessageBox.Show("没有找到【材质】的标题", "提示");
- return;
- }
- if (HProductNumCol == -1)
- {
- MessageBox.Show("没有找到【成品编号】的标题", "提示");
- return;
- }
- if (HVerNumCol == -1)
- {
- MessageBox.Show("没有找到【版本】的标题", "提示");
- return;
- }
- if (HMouldNoCol == -1)
- {
- MessageBox.Show("没有找到【模具编号】的标题", "提示");
- return;
- }
- if (HProcWorkNumCol == -1)
- {
- MessageBox.Show("没有找到【程序号】的标题", "提示");
- return;
- }
- //
- if (!Checkdata())
- {
- return;
- }
- if (grdMain.Rows.Count > 0)
- {
- hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);
- HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
- BillNew.omodel.HStandard = false;
- BillNew.omodel.HMainTimeUnit = "小时";
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
- BillNew.omodel.HBillNo = HBillNo;
- BillNew.omodel.HDate = DateTime.Today.Date;
- BillNew.omodel.HPicNumVer = "";
- BillNew.omodel.HPicNumAssemble = "";
- BillNew.omodel.HMaterTexture = "";
- BillNew.omodel.HProductNum = "";
- BillNew.omodel.HVerNum = "";
- BillNew.DetailColl.Clear();
- }
- for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
- {
- BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
- BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
- BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
- BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
- BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
- string sHNumber = "";
- if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "" )
+ //没有找到列
+ if (HMaterNumberCol == -1)
{
- //
- sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
- //审核代码是否合理
- if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ MessageBox.Show("没有找到【产品代码】的标题", "提示");
+ return;
+ }
+ if (HProcNameCol == -1)
+ {
+ MessageBox.Show("没有找到【工序】的标题", "提示");
+ return;
+ }
+ if (HWorkCenterNameCol == -1)
+ {
+ MessageBox.Show("没有找到【工作中心】的标题", "提示");
+ return;
+ }
+ if (HWorkQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【加工数量】的标题", "提示");
+ return;
+ }
+ if (HBeginFixQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【开工余量】的标题", "提示");
+ return;
+ }
+ if (HBeginDayQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【开工固天】的标题", "提示");
+ return;
+ }
+ if (HFixPriceCol == -1)
+ {
+ MessageBox.Show("没有找到【小时工资】的标题", "提示");
+ return;
+ }
+ if (HProcPriceCol == -1)
+ {
+ MessageBox.Show("没有找到【单个工价】的标题", "提示");
+ return;
+ }
+ if (HProcNoCol == -1)
+ {
+ MessageBox.Show("没有找到【工序序号】的标题", "提示");
+ return;
+ }
+ if (HTechnologyParameterCol == -1)
+ {
+ MessageBox.Show("没有找到【工艺参数】的标题", "提示");
+ return;
+ }
+ if (HPicNumCol == -1)
+ {
+ MessageBox.Show("没有找到【图纸编号】的标题", "提示");
+ return;
+ }
+ if (HProcCheckNoteCol == -1)
+ {
+ MessageBox.Show("没有找到【本工序确认记录】的标题", "提示");
+ return;
+ }
+ if (HPicNumVerCol == -1)
+ {
+ MessageBox.Show("没有找到【图号版本】的标题", "提示");
+ return;
+ }
+ if (HPicNumAssembleCol == -1)
+ {
+ MessageBox.Show("没有找到【总装图号】的标题", "提示");
+ return;
+ }
+ if (HMaterTextureCol == -1)
+ {
+ MessageBox.Show("没有找到【材质】的标题", "提示");
+ return;
+ }
+ if (HProductNumCol == -1)
+ {
+ MessageBox.Show("没有找到【成品编号】的标题", "提示");
+ return;
+ }
+ if (HVerNumCol == -1)
+ {
+ MessageBox.Show("没有找到【版本】的标题", "提示");
+ return;
+ }
+ if (HMouldNoCol == -1)
+ {
+ MessageBox.Show("没有找到【模具编号】的标题", "提示");
+ return;
+ }
+ if (HProcWorkNumCol == -1)
+ {
+ MessageBox.Show("没有找到【程序号】的标题", "提示");
+ return;
+ }
+ if (HPassRateCol == -1)
+ {
+ MessageBox.Show("没有找到【良率】的标题", "提示");
+ return;
+ }
+ //
+ if (!Checkdata())
+ {
+ return;
+ }
+ if (grdMain.Rows.Count > 0)
+ {
+ hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);
+ HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
+ BillNew.omodel.HStandard = false;
+ BillNew.omodel.HMainTimeUnit = "小时";
+ BillNew.omodel.HYear = 2011;
+ BillNew.omodel.HPeriod = 1;
+ BillNew.omodel.HBillNo = HBillNo;
+ BillNew.omodel.HDate = DateTime.Today.Date;
+ BillNew.omodel.HPicNumVer = "";
+ BillNew.omodel.HPicNumAssemble = "";
+ BillNew.omodel.HMaterTexture = "";
+ BillNew.omodel.HProductNum = "";
+ BillNew.omodel.HVerNum = "";
+ BillNew.DetailColl.Clear();
+ }
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
+ BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
+ BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
+ BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
+ BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
+ string sHNumber = "";
+ if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "")
{
- MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return;
- }
-
- if (hnumber == DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value))
- {
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sHNumber))
- {
- if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
- {
- BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
- BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
- BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
- BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
- }
-
- }
- else
- {
- BillNew.omodel.HMaterID = 0;
- MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
- return;
- }
- j++;
- //写入类
- WriteClass(i);
-
- }
- else
- {
- DataSet Ds;
- ClsCN oCn=new ClsCN();
- bool b = false;
- // 判断是否存在工艺路线
- Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
- if (checkadd.Checked == true)
- {
- //if (Ds.Tables[0].Rows.Count == 0)//追加
- //{
- //新增前 先删除原来工艺
- BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
- b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- if (b == false) return;
- c++;
- BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- //}
- //else
- //{
-
- //}
- }
- else
- {
- BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
- b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- if (b == false) return;
- c++;
- BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- }
-
-
- BillNew.DetailColl.Clear();
- hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ //
sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
-
//审核代码是否合理
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
{
MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
return;
}
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sHNumber))
+
+ if (hnumber == DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value))
{
- if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHNumber))
{
- BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
- BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
- BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
- BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ {
+ BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
+ BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
+ BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
+ BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ }
+
}
+ else
+ {
+ BillNew.omodel.HMaterID = 0;
+ MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
+ return;
+ }
+ j++;
+ //写入类
+ WriteClass(i);
}
else
{
- BillNew.omodel.HMaterID = 0;
- MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
- return;
+ DataSet Ds;
+ ClsCN oCn = new ClsCN();
+ bool b = false;
+ // 判断是否存在工艺路线
+ Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
+ if (checkadd.Checked == true)
+ {
+ //if (Ds.Tables[0].Rows.Count == 0)//追加
+ //{
+ //新增前 先删除原来工艺
+ BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
+ b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (b == false)
+ {
+ MessageBox.Show("第" + i.ToString() + "行,物料" + BillNew.omodel.HMaterNumber + "新增工艺路线失败！代码293行中，原因：" + ClsPub.sExeReturnInfo);
+ return;
+ }
+ c++;
+ BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //}
+ //else
+ //{
+
+ //}
+ }
+ else
+ {
+ BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
+ b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (b == false)
+ {
+ MessageBox.Show("第" + i.ToString() + "行,物料" + sHNumber + "新增工艺路线失败！代码310行中");
+ return;
+ }
+ c++;
+ BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+
+
+ BillNew.DetailColl.Clear();
+ hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+
+ //审核代码是否合理
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
+ return;
+ }
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ {
+ BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
+ BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
+ BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
+ BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ }
+
+ }
+ else
+ {
+ BillNew.omodel.HMaterID = 0;
+ MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
+ return;
+ }
+ j = 0;
+ HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
+ BillNew.omodel.HBillNo = HBillNo;
+ //写入类
+ WriteClass(i);
}
- j = 0;
- HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
- BillNew.omodel.HBillNo = HBillNo;
- //写入类
- WriteClass(i);
+ }
+ else
+ {
+ MessageBox.Show("第" + i.ToString() + "行,没有找到对应的物料！");
+ return;
}
}
- else
+ //最后一个物料处理
+ if (BillNew.DetailColl.Count > 0)
{
- MessageBox.Show("第" + i.ToString() + "行,没有找到对应的物料！");
- return;
- }
- }
- //最后一个物料处理
- if (BillNew.DetailColl.Count > 0)
- {
- DataSet Ds;
- ClsCN oCn = new ClsCN();
- bool b = false;
- //Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
- //if (Ds.Tables[0].Rows.Count == 0)
- //{
+ DataSet Ds;
+ ClsCN oCn = new ClsCN();
+ bool b = false;
+ //Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
+ //if (Ds.Tables[0].Rows.Count == 0)
+ //{
BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
if (b == false) return;
c++;
BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- //}
- MessageBox.Show("导入完毕:共"+c.ToString()+"个工艺路线");
- grdMain.DataSource = null;
+ //}
+ MessageBox.Show("导入完毕:共" + c.ToString() + "个工艺路线");
+ grdMain.DataSource = null;
+ }
+ c = 0;
}
- c = 0;
+ catch (Exception e)
+ {
+ MessageBox.Show("导入失败!原因:" + e.Message, "提示");
+ }
}
//写入类 从控件
private bool WriteClass(int row)
{
string sHNumber = "";
- string sHNamePoc = "";
+ string sHNamePoc = "";
string sHNumberCen = "";
Single sWorkQty = 0;
Single sBeginDayQty = 0;
Single sBeginFixQty = 0;
+ Single sHPassRate = 0;
//long HItemID = 0;
//
- sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
+ sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
sHNumberCen = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HWorkCenterNameCol].Value);
sHNamePoc = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcNameCol].Value);
sWorkQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HWorkQtyCol].Value);
sBeginDayQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HBeginDayQtyCol].Value);
sBeginFixQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HBeginFixQtyCol].Value);
+ sHPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HPassRateCol].Value);
//判断是否允许 保存
-
- Model.ClsGy_RoutingBillSub oSub=new Model.ClsGy_RoutingBillSub();
+
+ Model.ClsGy_RoutingBillSub oSub = new Model.ClsGy_RoutingBillSub();
//得到工序内码
if (oProcHlp.GetInfoByName(sHNamePoc))
@@ -399,20 +423,21 @@
oSub.HProcNo = DBUtility.ClsPub.isInt(grdMain.Rows[row].Cells[HProcNoCol].Value);
oSub.HUnitTime = 1;
oSub.HWorkQty = sWorkQty;
+ oSub.HPassRate = sHPassRate;
oSub.HRemark = "";
oSub.HTimeUnit = "小时";
oSub.HReadyTime = 0;
oSub.HQueueTime = 0;
oSub.HMoveTime = 0;
//
-
+
//
oSub.HCloseMan = "";
oSub.HCloseType = false;
oSub.HSourceInterID = 0;
oSub.HSourceEntryID = 0;
oSub.HSourceBillType = "";
- oSub.HSourceBillNo ="";
+ oSub.HSourceBillNo = "";
oSub.HRelationQty = 0;
oSub.HRelationMoney = 0;
@@ -435,22 +460,39 @@
//检查物料
private bool Checkdata()
{
- bool b=false;
+ bool b = false;
string sErrMsg = "";
string sMsg = "";
for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
{
string sHNumber = "";
- string sHNamePoc = "";
+ string sHNamePoc = "";
string sHNumberCen = "";
-
+ Single sWorkQty = 0;
+ Single sHPassRate = 0;
+
//
sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
sHNumberCen = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkCenterNameCol].Value);
sHNamePoc = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNameCol].Value);
- if (sHNumber != "" )
+ sWorkQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HWorkQtyCol].Value);
+ sHPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value);
+ if (sHNumber != "")
{
//
+ int index = i + 1;
+ //加工数量不能小于等于零
+ if (sWorkQty <= 0)
+ {
+ MessageBox.Show("第" + index + "行加工数量不能小于等于零！", "提示");
+ return false;
+ }
+ //良率不能小于等于零
+ if (sHPassRate <= 0)
+ {
+ MessageBox.Show("第" + index + "行良率不能小于等于零！", "提示");
+ return false;
+ }
//审核代码是否合理
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
{
@@ -462,9 +504,9 @@
if (!oMaterHlp.GetInfoByNumber(sHNumber))
{
sMsg = "[" + sHNumber + "]物料不存在";
- if (sErrMsg.Contains(sMsg)==false)
+ if (sErrMsg.Contains(sMsg) == false)
{
- sErrMsg = sErrMsg + "[" + sHNumber + "]物料不存在\r\n" ;
+ sErrMsg = sErrMsg + "[" + sHNumber + "]物料不存在\r\n";
}
b = true;
}
@@ -491,7 +533,7 @@
}
- }
+ }
}
if (b == true)
{
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
index 5c99205..66d0987 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
@@ -180,6 +180,10 @@
sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + " " + dtpHETime.Value.ToShortTimeString() + "'";
sDlgWhere = sDlgWhere + ",'" + txtHOrderProcNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaterNumber.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcExchBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHEmpName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProjectNum.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
index c3e6dd2..8293ab8 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
@@ -71,6 +71,14 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.textHProcName = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.textHProcExchBillNo = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textHEmpName = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textHProjectNum = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -110,7 +118,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1432, 59);
+ this.Tool.Size = new System.Drawing.Size(1346, 47);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -124,7 +132,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 56);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -132,14 +140,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -160,7 +168,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
//
// dc
//
@@ -180,13 +188,13 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator5.Visible = false;
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator4.Visible = false;
//
// dy
@@ -251,7 +259,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 47);
//
// tc
//
@@ -270,13 +278,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
//
// mrlk
//
@@ -286,7 +294,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 56);
+ this.mrlk.Size = new System.Drawing.Size(60, 44);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -296,7 +304,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
//
// bclk
//
@@ -306,7 +314,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 56);
+ this.bclk.Size = new System.Drawing.Size(60, 44);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -316,13 +324,21 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.textHProjectNum);
+ this.pPic.Controls.Add(this.label7);
+ this.pPic.Controls.Add(this.textHEmpName);
+ this.pPic.Controls.Add(this.label6);
+ this.pPic.Controls.Add(this.textHProcExchBillNo);
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.textHProcName);
+ this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.txtHOrderProcNo);
@@ -339,74 +355,68 @@
this.pPic.Controls.Add(this.label4);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 59);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 47);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1432, 69);
+ this.pPic.Size = new System.Drawing.Size(1346, 97);
this.pPic.TabIndex = 17;
//
// txtHMaterNumber
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(1144, 7);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(858, 6);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(222, 25);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(168, 21);
this.txtHMaterNumber.TabIndex = 96;
//
// label9
//
this.label9.AutoSize = true;
this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(1074, 10);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(806, 8);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
+ this.label9.Size = new System.Drawing.Size(53, 12);
this.label9.TabIndex = 95;
this.label9.Text = "鐗╂枡浠ｇ爜";
//
// txtHOrderProcNo
//
- this.txtHOrderProcNo.Location = new System.Drawing.Point(426, 38);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNo.Location = new System.Drawing.Point(320, 30);
this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
+ this.txtHOrderProcNo.Size = new System.Drawing.Size(121, 21);
this.txtHOrderProcNo.TabIndex = 94;
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(336, 38);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(252, 30);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
+ this.label8.Size = new System.Drawing.Size(65, 12);
this.label8.TabIndex = 93;
this.label8.Text = "璁㈠崟璺熻釜鍙�";
//
// dtpHETime
//
this.dtpHETime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHETime.Location = new System.Drawing.Point(910, 37);
- this.dtpHETime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHETime.Location = new System.Drawing.Point(682, 30);
this.dtpHETime.Name = "dtpHETime";
- this.dtpHETime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHETime.Size = new System.Drawing.Size(111, 21);
this.dtpHETime.TabIndex = 92;
//
// dtpHBTime
//
this.dtpHBTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHBTime.Location = new System.Drawing.Point(910, 5);
- this.dtpHBTime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBTime.Location = new System.Drawing.Point(682, 4);
this.dtpHBTime.Name = "dtpHBTime";
- this.dtpHBTime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBTime.Size = new System.Drawing.Size(111, 21);
this.dtpHBTime.TabIndex = 91;
//
// chkYestoday
//
this.chkYestoday.AutoSize = true;
- this.chkYestoday.Location = new System.Drawing.Point(613, 40);
+ this.chkYestoday.Location = new System.Drawing.Point(460, 32);
+ this.chkYestoday.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkYestoday.Name = "chkYestoday";
- this.chkYestoday.Size = new System.Drawing.Size(59, 19);
+ this.chkYestoday.Size = new System.Drawing.Size(48, 16);
this.chkYestoday.TabIndex = 90;
this.chkYestoday.Text = "鏄ㄦ棩";
this.chkYestoday.UseVisualStyleBackColor = true;
@@ -416,20 +426,18 @@
//
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
this.cmdHCenterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHCenterID.Location = new System.Drawing.Point(568, 4);
- this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHCenterID.Location = new System.Drawing.Point(426, 3);
this.cmdHCenterID.Name = "cmdHCenterID";
- this.cmdHCenterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHCenterID.Size = new System.Drawing.Size(22, 22);
this.cmdHCenterID.TabIndex = 89;
this.cmdHCenterID.UseVisualStyleBackColor = true;
this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(426, 5);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(320, 4);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(143, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(108, 21);
this.txtHCenterID.TabIndex = 88;
this.txtHCenterID.WordWrap = false;
this.txtHCenterID.TextChanged += new System.EventHandler(this.txtHCenterID_TextChanged);
@@ -438,50 +446,45 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(350, 9);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(262, 7);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 87;
this.label2.Text = "宸ヤ綔涓績";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(755, 37);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(566, 30);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(111, 21);
this.dtpHEDate.TabIndex = 61;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(679, 41);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(509, 33);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 60;
this.label3.Text = "缁撴潫鏃ユ湡";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(755, 4);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(566, 3);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(111, 21);
this.dtpHBDate.TabIndex = 59;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(679, 8);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(509, 6);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 58;
this.label4.Text = "寮�濮嬫棩鏈�";
//
@@ -491,10 +494,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 20);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 16);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(179, 24);
+ this.lblCaption.Size = new System.Drawing.Size(152, 19);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "ReportTemplet";
//
@@ -509,12 +511,11 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 144);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1432, 414);
+ this.grdMain.Size = new System.Drawing.Size(1346, 290);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -529,26 +530,92 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 542);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 434);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1432, 24);
+ this.grdSum.Size = new System.Drawing.Size(1346, 19);
this.grdSum.TabIndex = 55;
+ //
+ // textHProcName
+ //
+ this.textHProcName.Location = new System.Drawing.Point(858, 31);
+ this.textHProcName.Name = "textHProcName";
+ this.textHProcName.Size = new System.Drawing.Size(168, 21);
+ this.textHProcName.TabIndex = 98;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(810, 37);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(29, 12);
+ this.label1.TabIndex = 97;
+ this.label1.Text = "宸ュ簭";
+ //
+ // textHProcExchBillNo
+ //
+ this.textHProcExchBillNo.Location = new System.Drawing.Point(320, 60);
+ this.textHProcExchBillNo.Name = "textHProcExchBillNo";
+ this.textHProcExchBillNo.Size = new System.Drawing.Size(168, 21);
+ this.textHProcExchBillNo.TabIndex = 100;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(253, 64);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.TabIndex = 99;
+ this.label5.Text = "宸ュ簭娴佽浆鍗�";
+ //
+ // textHEmpName
+ //
+ this.textHEmpName.Location = new System.Drawing.Point(566, 60);
+ this.textHEmpName.Name = "textHEmpName";
+ this.textHEmpName.Size = new System.Drawing.Size(168, 21);
+ this.textHEmpName.TabIndex = 102;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(525, 65);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.TabIndex = 101;
+ this.label6.Text = "鑱屽憳";
+ //
+ // textHProjectNum
+ //
+ this.textHProjectNum.Location = new System.Drawing.Point(858, 60);
+ this.textHProjectNum.Name = "textHProjectNum";
+ this.textHProjectNum.Size = new System.Drawing.Size(168, 21);
+ this.textHProjectNum.TabIndex = 104;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(806, 64);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(41, 12);
+ this.label7.TabIndex = 103;
+ this.label7.Text = "椤圭洰鍙�";
//
// Sc_StationOutSumReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1432, 566);
+ this.ClientSize = new System.Drawing.Size(1346, 453);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Sc_StationOutSumReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -608,5 +675,13 @@
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ public System.Windows.Forms.TextBox textHProjectNum;
+ private System.Windows.Forms.Label label7;
+ public System.Windows.Forms.TextBox textHEmpName;
+ private System.Windows.Forms.Label label6;
+ public System.Windows.Forms.TextBox textHProcExchBillNo;
+ private System.Windows.Forms.Label label5;
+ public System.Windows.Forms.TextBox textHProcName;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
index 9f63122..c623f5e 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
@@ -256,7 +256,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -268,7 +268,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -280,7 +280,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -294,7 +294,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
sbY1hi22Iptt5ecmuQgXxcWvFGojuXDy66AUyo9p9t2wx/f5pC9l+/LU06dP79frET/jCc7B5QvB6Z3R
6vLNwB0IIzi7hC8se/pHJpAp/rFD+f45Ynf7JfiRTmtlvN6IfBndEYtzVEKpt3etnAiFt2Gsa0J1Qwt6
PcHsA10Ojxx4VVJaE8kU3j/SuHuIIXp8Crc/nH3AbOuTA89xBbF48ruvSbyoZcw2x++BqdA8xDTQbemR
@@ -307,7 +307,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -321,7 +321,7 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -334,7 +334,7 @@
<data name="view.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -347,7 +347,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -357,7 +357,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -372,7 +372,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 46f3566..5b15b03 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -102,6 +102,9 @@
public const Int16 HTechnologyParameterCol = 76;
public const Int16 HPicNumCol = 77;
public const Int16 HProcCheckNoteCol = 78;
+ public const Int16 HMouldNoCol = 79;
+ public const Int16 HProcWorkNumCol = 80;
+ public const Int16 HICMOEntryIDCol = 81;
@@ -1055,6 +1058,11 @@
this.txtHOrderProcNO.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HOrderProcNO);
this.txtHMateOutBatchNo.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMateOutBatchNo);
this.txtHProjectNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProjectNum);
+ this.textHPicNumVer.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumVer);
+ this.textHPicNumAssemble.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumAssemble);
+ this.textHMaterTexture.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMaterTexture);
+ this.textHProductNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProductNum);
+ this.textHVerNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HVerNum);
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
@@ -1079,6 +1087,8 @@
grdMain.Rows[i].Cells[HRelationQty_WWOrderCol].Value = oSub.HRelationQty_WWOrder.ToString();
grdMain.Rows[i].Cells[HRelationQty_BadCol].Value = oSub.HRelationQty_Bad.ToString();
grdMain.Rows[i].Cells[HRelationMoneyCol].Value = oSub.HRelationMoney.ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oSub.HMouldNo.ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oSub.HProcWorkNum.ToString();
//======================================================================================
//
grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
@@ -1208,6 +1218,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oSub.HICMOBillNo;
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oSub.HICMOInterID.ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oSub.HICMOEntryID.ToString();
grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oSub.HSeOrderBillNo;
grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value = oSub.HSeOrderInterID.ToString();
grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value = oSub.HSeOrderEntryID.ToString();
@@ -1307,6 +1318,8 @@
}
return true;
}
+
+
//淇濆瓨鍗曟嵁
private bool Sub_SaveBill()
{
@@ -1400,6 +1413,12 @@
BillNew.omodel.HMaterIDB = ClsPub.isStrNull(this.txtHMaterIDB.Text);
BillNew.omodel.HMaterIDC = ClsPub.isStrNull(this.txtHMaterIDC.Text);
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(this.txtHMaterIDD.Text);
+ //===================
+ BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
+ BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
+ BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
+ BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
+ BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
//鑾峰彇鏈�澶ц鍙�
int MaxRowNo = 0;
for (int n = 0; n < grdMain.Rows.Count; n++)
@@ -1525,6 +1544,7 @@
}
oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
@@ -1538,6 +1558,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
BillNew.DetailColl.Add(oSub);
}
}
@@ -1584,7 +1606,7 @@
{
//
- grdMain.ColumnCount = 79; //鎬诲垪鏁�
+ grdMain.ColumnCount = 82; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1650,6 +1672,7 @@
grdMain.Columns[HICMOBillNoCol].HeaderText = "鐢熶骇璁㈠崟鍙�";
grdMain.Columns[HICMOInterIDCol].HeaderText = "鐢熶骇璁㈠崟涓诲唴鐮�";
+ grdMain.Columns[HICMOEntryIDCol].HeaderText = "鐢熶骇璁㈠崟瀛愬唴鐮�";
grdMain.Columns[HSeOrderInterIDCol].HeaderText = "閿�鍞鍗曚富鍐呯爜";
grdMain.Columns[HSeOrderEntryIDCol].HeaderText = "閿�鍞鍗曞瓙鍐呯爜";
grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞崟鍙�";
@@ -1661,6 +1684,8 @@
grdMain.Columns[HTechnologyParameterCol].HeaderText = "宸ヨ壓鍙傛暟";
grdMain.Columns[HPicNumCol].HeaderText = "鍥剧焊缂栧彿";
grdMain.Columns[HProcCheckNoteCol].HeaderText = "鏈伐搴忕‘璁よ褰�";
+ grdMain.Columns[HMouldNoCol].HeaderText = "妯″叿缂栧彿";
+ grdMain.Columns[HProcWorkNumCol].HeaderText = "绋嬪簭鍙�";
// grdMain.Columns[HKeyProcCol].HeaderText = "鍏抽敭宸ュ簭";
grdMain.Columns[HKeyProcCol].Visible = false;
////鍥哄畾璧嬪��=====================================================
@@ -1709,6 +1734,7 @@
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HWorkerIDCol].Visible = false;
grdMain.Columns[HICMOInterIDCol].Visible = false;
+ grdMain.Columns[HICMOEntryIDCol].Visible = false;
grdMain.Columns[HOutMoneyCol].Visible = false;
grdMain.Columns[HSourceIDCol].Visible = false;
//grdMain.Columns[HEntryIDCol].Visible = false;
@@ -1815,6 +1841,8 @@
"," + HLastProcCol.ToString() +
"," + HFstProcCol.ToString() +
"," + HRemarkCol.ToString() +
+ "," + HMouldNoCol.ToString() +
+ "," + HProcWorkNumCol.ToString() +
"," + HSupNameCol +
"," + HSupFlagCol;
//璁剧疆鍚堣鍒�
@@ -3408,6 +3436,11 @@
txtHCusName.Text = oTable.Rows[row]["瀹㈡埛鍚嶇О"].ToString();
txtHWorkRemark.Text = oTable.Rows[row]["鐢熶骇澶囨敞"].ToString();
txtHImportNote.Text = oTable.Rows[row]["閲嶈鎻愮ず"].ToString();
+ textHPicNumVer.Text = oTable.Rows[row]["鍥惧彿鐗堟湰"].ToString();
+ textHPicNumAssemble.Text = oTable.Rows[row]["鎬昏鍥惧彿"].ToString();
+ textHMaterTexture.Text = oTable.Rows[row]["鏉愯川"].ToString();
+ textHProductNum.Text = oTable.Rows[row]["鎴愬搧缂栧彿"].ToString();
+ textHVerNum.Text = oTable.Rows[row]["鐗堟湰"].ToString();
// txtHWorkTypeID.Text = oTable.Rows[row]["鐢熶骇杞﹂棿鍚嶇О"].ToString();
@@ -3481,6 +3514,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oTable.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString();
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
grdMain.Rows[i].Cells[HSourceEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceBillTypeCol].Value = oTable.Rows[i]["HBillType"].ToString();
@@ -3492,6 +3526,8 @@
grdMain.Rows[i].Cells[HProcCheckNoteCol].Value = oTable.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString();
grdMain.Rows[i].Cells[HOverRateCol].Value = oTable.Rows[i]["瓒呴姣斾緥"].ToString();
grdMain.Rows[i].Cells[HMaxQtyCol].Value = oTable.Rows[i]["鏈�楂樹笂闄�"].ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oTable.Rows[i]["妯″叿缂栧彿"].ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oTable.Rows[i]["绋嬪簭鍙�"].ToString();
}
Sub_CountProcExchQty();
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
index 7ef3e61..792fbf9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
@@ -226,6 +226,16 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
+ this.label62 = new System.Windows.Forms.Label();
+ this.textHVerNum = new System.Windows.Forms.TextBox();
+ this.label63 = new System.Windows.Forms.Label();
+ this.label64 = new System.Windows.Forms.Label();
+ this.textHPicNumVer = new System.Windows.Forms.TextBox();
+ this.label65 = new System.Windows.Forms.Label();
+ this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
+ this.label66 = new System.Windows.Forms.Label();
+ this.textHMaterTexture = new System.Windows.Forms.TextBox();
+ this.textHProductNum = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl2.SuspendLayout();
@@ -286,7 +296,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Size = new System.Drawing.Size(1348, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -748,7 +758,7 @@
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.Location = new System.Drawing.Point(0, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(937, 34);
+ this.lblCaption.Size = new System.Drawing.Size(1268, 34);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -762,7 +772,7 @@
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 254);
+ this.P1.Size = new System.Drawing.Size(1268, 254);
this.P1.TabIndex = 31;
//
// tabControl2
@@ -775,7 +785,7 @@
this.tabControl2.Margin = new System.Windows.Forms.Padding(2);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(937, 220);
+ this.tabControl2.Size = new System.Drawing.Size(1268, 220);
this.tabControl2.TabIndex = 310;
//
// tabPage2
@@ -785,7 +795,7 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage2.Size = new System.Drawing.Size(929, 194);
+ this.tabPage2.Size = new System.Drawing.Size(1260, 194);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "琛ㄥご淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -793,6 +803,16 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Lavender;
+ this.gbUp.Controls.Add(this.textHProductNum);
+ this.gbUp.Controls.Add(this.textHMaterTexture);
+ this.gbUp.Controls.Add(this.label62);
+ this.gbUp.Controls.Add(this.textHVerNum);
+ this.gbUp.Controls.Add(this.label63);
+ this.gbUp.Controls.Add(this.label64);
+ this.gbUp.Controls.Add(this.textHPicNumVer);
+ this.gbUp.Controls.Add(this.label65);
+ this.gbUp.Controls.Add(this.textHPicNumAssemble);
+ this.gbUp.Controls.Add(this.label66);
this.gbUp.Controls.Add(this.label42);
this.gbUp.Controls.Add(this.txtHProjectNum);
this.gbUp.Controls.Add(this.cmdEquipMentID);
@@ -838,7 +858,7 @@
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Location = new System.Drawing.Point(2, 2);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(925, 190);
+ this.gbUp.Size = new System.Drawing.Size(1256, 190);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -2105,7 +2125,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(41, 526);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 73);
+ this.panel2.Size = new System.Drawing.Size(1268, 73);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
@@ -2324,7 +2344,7 @@
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Location = new System.Drawing.Point(1309, 50);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(39, 549);
this.panel3.TabIndex = 34;
@@ -2347,7 +2367,7 @@
this.tabControl1.Location = new System.Drawing.Point(41, 304);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(937, 222);
+ this.tabControl1.Size = new System.Drawing.Size(1268, 222);
this.tabControl1.TabIndex = 55;
//
// tabPage1
@@ -2358,7 +2378,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(929, 196);
+ this.tabPage1.Size = new System.Drawing.Size(1260, 196);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏄庣粏淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -2377,7 +2397,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(923, 146);
+ this.grdMain.Size = new System.Drawing.Size(1254, 146);
this.grdMain.TabIndex = 58;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -2402,7 +2422,7 @@
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(923, 19);
+ this.grdSum.Size = new System.Drawing.Size(1254, 19);
this.grdSum.TabIndex = 57;
//
// panel6
@@ -2413,7 +2433,7 @@
this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel6.Location = new System.Drawing.Point(3, 168);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(923, 25);
+ this.panel6.Size = new System.Drawing.Size(1254, 25);
this.panel6.TabIndex = 56;
//
// lblHStockQty
@@ -2424,12 +2444,110 @@
this.lblHStockQty.Size = new System.Drawing.Size(0, 12);
this.lblHStockQty.TabIndex = 0;
//
+ // label62
+ //
+ this.label62.AutoSize = true;
+ this.label62.ForeColor = System.Drawing.Color.Black;
+ this.label62.Location = new System.Drawing.Point(928, 138);
+ this.label62.Name = "label62";
+ this.label62.Size = new System.Drawing.Size(53, 12);
+ this.label62.TabIndex = 333;
+ this.label62.Text = "鐗� 鏈�";
+ //
+ // textHVerNum
+ //
+ this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHVerNum.Location = new System.Drawing.Point(1000, 134);
+ this.textHVerNum.Name = "textHVerNum";
+ this.textHVerNum.Size = new System.Drawing.Size(189, 21);
+ this.textHVerNum.TabIndex = 334;
+ this.textHVerNum.Tag = "0";
+ //
+ // label63
+ //
+ this.label63.AutoSize = true;
+ this.label63.ForeColor = System.Drawing.Color.Black;
+ this.label63.Location = new System.Drawing.Point(928, 110);
+ this.label63.Name = "label63";
+ this.label63.Size = new System.Drawing.Size(53, 12);
+ this.label63.TabIndex = 330;
+ this.label63.Text = "鎴愬搧缂栧彿";
+ //
+ // label64
+ //
+ this.label64.AutoSize = true;
+ this.label64.ForeColor = System.Drawing.Color.Black;
+ this.label64.Location = new System.Drawing.Point(926, 27);
+ this.label64.Name = "label64";
+ this.label64.Size = new System.Drawing.Size(53, 12);
+ this.label64.TabIndex = 328;
+ this.label64.Text = "鍥惧彿鐗堟湰";
+ //
+ // textHPicNumVer
+ //
+ this.textHPicNumVer.BackColor = System.Drawing.Color.Beige;
+ this.textHPicNumVer.Enabled = false;
+ this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumVer.Location = new System.Drawing.Point(1000, 24);
+ this.textHPicNumVer.Name = "textHPicNumVer";
+ this.textHPicNumVer.ReadOnly = true;
+ this.textHPicNumVer.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumVer.TabIndex = 329;
+ //
+ // label65
+ //
+ this.label65.AutoSize = true;
+ this.label65.ForeColor = System.Drawing.Color.Black;
+ this.label65.Location = new System.Drawing.Point(927, 56);
+ this.label65.Name = "label65";
+ this.label65.Size = new System.Drawing.Size(53, 12);
+ this.label65.TabIndex = 326;
+ this.label65.Text = "鎬昏鍥惧彿";
+ //
+ // textHPicNumAssemble
+ //
+ this.textHPicNumAssemble.BackColor = System.Drawing.SystemColors.Window;
+ this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumAssemble.Location = new System.Drawing.Point(1001, 52);
+ this.textHPicNumAssemble.Name = "textHPicNumAssemble";
+ this.textHPicNumAssemble.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumAssemble.TabIndex = 327;
+ this.textHPicNumAssemble.Tag = "0";
+ //
+ // label66
+ //
+ this.label66.AutoSize = true;
+ this.label66.ForeColor = System.Drawing.Color.Black;
+ this.label66.Location = new System.Drawing.Point(926, 84);
+ this.label66.Name = "label66";
+ this.label66.Size = new System.Drawing.Size(53, 12);
+ this.label66.TabIndex = 323;
+ this.label66.Text = "鏉� 璐�";
+ //
+ // textHMaterTexture
+ //
+ this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHMaterTexture.Location = new System.Drawing.Point(1001, 80);
+ this.textHMaterTexture.Name = "textHMaterTexture";
+ this.textHMaterTexture.Size = new System.Drawing.Size(189, 21);
+ this.textHMaterTexture.TabIndex = 335;
+ this.textHMaterTexture.Tag = "0";
+ //
+ // textHProductNum
+ //
+ this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHProductNum.Location = new System.Drawing.Point(1001, 106);
+ this.textHProductNum.Name = "textHProductNum";
+ this.textHProductNum.Size = new System.Drawing.Size(189, 21);
+ this.textHProductNum.TabIndex = 336;
+ this.textHProductNum.Tag = "0";
+ //
// Sc_ProcessExchangeBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.ClientSize = new System.Drawing.Size(1348, 599);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -2674,5 +2792,15 @@
private System.Windows.Forms.Label label43;
private System.Windows.Forms.ToolStripMenuItem 闅愯棌鍒楄缃甌oolStripMenuItem;
private System.Windows.Forms.ToolStripButton fz;
+ private System.Windows.Forms.TextBox textHProductNum;
+ private System.Windows.Forms.TextBox textHMaterTexture;
+ private System.Windows.Forms.Label label62;
+ private System.Windows.Forms.TextBox textHVerNum;
+ private System.Windows.Forms.Label label63;
+ private System.Windows.Forms.Label label64;
+ private System.Windows.Forms.TextBox textHPicNumVer;
+ private System.Windows.Forms.Label label65;
+ private System.Windows.Forms.TextBox textHPicNumAssemble;
+ private System.Windows.Forms.Label label66;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
index 0a629ae..659e23f 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
@@ -944,6 +944,7 @@
this.txtHWWOrderBillNo.Text = BillOld.omodel.HWWOrderBillNo;
this.txtHICMOBillNo.Text = BillOld.omodel.HICMOBillNo;
this.txtHICMOBillNo.Tag = BillOld.omodel.HICMOInterID.ToString();
+ this.txtHICMOEntryID.Text = BillOld.omodel.HICMOEntryID.ToString();
this.txtHExplanation.Text = BillOld.omodel.HExplanation;
this.txtHInnerBillNo.Text = BillOld.omodel.HInnerBillNo;
this.txtHBatchNo.Text = BillOld.omodel.HBatchNo;
@@ -1266,6 +1267,7 @@
BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(this.txtHWWOrderEntryID.Text.ToString());
BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(this.txtHWWOrderBillNo.Text);
BillNew.omodel.HICMOInterID = ClsPub.isLong(this.txtHICMOBillNo.Tag);
+ BillNew.omodel.HICMOEntryID = ClsPub.isLong(this.txtHICMOEntryID.Text);
BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(this.txtHICMOBillNo.Text);
BillNew.omodel.HPrevMainSourceInterID = ClsPub.isLong(txtHPrevMainSourceInterID.Text);
BillNew.omodel.HMainSourceInterID = ClsPub.isLong(txtHMainSourceInterID.Text);
@@ -1372,6 +1374,7 @@
//
oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ //oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
index 8e362be..e37a8c9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
@@ -163,6 +163,7 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
+ this.txtHICMOEntryID = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -518,71 +519,71 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(178, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(164, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(178, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(164, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(178, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(164, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
// 澶嶅埗鍗曟嵁ToolStripMenuItem
//
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Name = "澶嶅埗鍗曟嵁ToolStripMenuItem";
- this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Text = "澶嶅埗鍗曟嵁";
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Click += new System.EventHandler(this.澶嶅埗鍗曟嵁ToolStripMenuItem_Click);
//
@@ -672,6 +673,7 @@
// P1
//
this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.txtHICMOEntryID);
this.P1.Controls.Add(this.pic1);
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
@@ -1666,6 +1668,7 @@
this.grdPrint.Location = new System.Drawing.Point(1079, 679);
this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 46;
@@ -1734,6 +1737,7 @@
this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.grdSum.Size = new System.Drawing.Size(1233, 24);
@@ -1759,6 +1763,14 @@
this.lblHStockQty.Name = "lblHStockQty";
this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
this.lblHStockQty.TabIndex = 0;
+ //
+ // txtHICMOEntryID
+ //
+ this.txtHICMOEntryID.Location = new System.Drawing.Point(785, 12);
+ this.txtHICMOEntryID.Name = "txtHICMOEntryID";
+ this.txtHICMOEntryID.Size = new System.Drawing.Size(100, 25);
+ this.txtHICMOEntryID.TabIndex = 277;
+ this.txtHICMOEntryID.Visible = false;
//
// Sc_ProcessExchangeBill_CF
//
@@ -1937,5 +1949,6 @@
private System.Windows.Forms.TextBox txtHPrevMainSourceInterID;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.TextBox txtHOrderProcNO;
+ private System.Windows.Forms.TextBox txtHICMOEntryID;
}
}
\ No newline at end of file
--
Gitblit v1.9.1