Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2021-11-29 d03d898e83d04d94b771a3326d48b55c67057c2b

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 BaseSet/¹«ÓÃ×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.cs

@@ -500,7 +500,17 @@
                }
                else
                {
                    txtHWasterWHID.Text = ""; 
                    txtHWasterWHID.Text = "";
                }
                //
                if (oWH.GetInfoByID(oProcHlp.omodel.HBadCountDevelopWHID))
                {
                    txtHBadCountDevelopWHID.Text = oWH.omodel.HName;
                    txtHBadCountDevelopWHID.Tag = oWH.omodel.HItemID.ToString();
                }
                else
                {
                    txtHBadCountDevelopWHID.Text = "";
                }
                //
                txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
@@ -609,6 +619,7 @@
            oProc.oModel.HProcMulID = DBUtility.ClsPub.isLong(txtHProcMulID.Tag.ToString());
            oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
            oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
            oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
            oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
            oProc.oModel.HTypeCount = chkHTypeCount.Checked;
            oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -736,6 +747,20 @@
            }
        }

        private void cmdHBadCountDevelopWHID_Click(object sender, EventArgs e)
        {
            DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
            if (oWare.RefreshView())
            {
                this.txtHBadCountDevelopWHID.Text = oWare.oModel.HName;
                this.txtHBadCountDevelopWHID.Tag = oWare.oModel.HItemID.ToString();
            }
            else
            {
                this.txtHBadCountDevelopWHID.Text = "";
            }
        }

        private void txtHBadWHID_TextChanged(object sender, EventArgs e)
        {
            if (txtHBadWHID.Text.Length == 0)
@@ -751,5 +776,14 @@
                txtHWasterWHID.Tag = "0";
            }
        }

        private void txtHBadCountDevelopWHID_TextChanged(object sender, EventArgs e)
        {
            if (txtHBadCountDevelopWHID.Text.Length == 0)
            {
                txtHBadCountDevelopWHID.Tag = "0";
            }
        }

    }
}

 BaseSet/¹«ÓÃ×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.designer.cs

@@ -30,7 +30,7 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Process));
            System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("项目");
            System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("项目");
            this.ToolBar = new System.Windows.Forms.ToolStrip();
            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
            this.dc = new System.Windows.Forms.ToolStripButton();
@@ -58,6 +58,12 @@
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.grdMain = new System.Windows.Forms.DataGridView();
            this.tabPage2 = new System.Windows.Forms.TabPage();
            this.cmdHWasterWHID = new System.Windows.Forms.Button();
            this.label16 = new System.Windows.Forms.Label();
            this.txtHWasterWHID = new System.Windows.Forms.TextBox();
            this.cmdHBadWHID = new System.Windows.Forms.Button();
            this.label15 = new System.Windows.Forms.Label();
            this.txtHBadWHID = new System.Windows.Forms.TextBox();
            this.txtHProcCheckNote = new System.Windows.Forms.TextBox();
            this.label14 = new System.Windows.Forms.Label();
            this.cmdHProcMulID = new System.Windows.Forms.Button();
@@ -101,12 +107,9 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.cmdLoadTree = new System.Windows.Forms.Button();
            this.label3 = new System.Windows.Forms.Label();
            this.cmdHBadWHID = new System.Windows.Forms.Button();
            this.label15 = new System.Windows.Forms.Label();
            this.txtHBadWHID = new System.Windows.Forms.TextBox();
            this.cmdHWasterWHID = new System.Windows.Forms.Button();
            this.label16 = new System.Windows.Forms.Label();
            this.txtHWasterWHID = new System.Windows.Forms.TextBox();
            this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
            this.label17 = new System.Windows.Forms.Label();
            this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
            this.ToolBar.SuspendLayout();
            this.stTab.SuspendLayout();
            this.tabPage1.SuspendLayout();
@@ -150,7 +153,7 @@
            this.ToolBar.Location = new System.Drawing.Point(0, 0);
            this.ToolBar.Name = "ToolBar";
            this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
            this.ToolBar.Size = new System.Drawing.Size(1169, 62);
            this.ToolBar.Size = new System.Drawing.Size(877, 50);
            this.ToolBar.Stretch = true;
            this.ToolBar.TabIndex = 13;
            this.ToolBar.Text = "toolStrip1";
@@ -158,7 +161,7 @@
            // toolStripSeparator10
            // 
            this.toolStripSeparator10.Name = "toolStripSeparator10";
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
            // 
            // dc
            // 
@@ -190,7 +193,7 @@
            // toolStripSeparator4
            // 
            this.toolStripSeparator4.Name = "toolStripSeparator4";
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
            // 
            // xz
            // 
@@ -238,7 +241,7 @@
            // toolStripSeparator2
            // 
            this.toolStripSeparator2.Name = "toolStripSeparator2";
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
            // 
            // cx
            // 
@@ -271,7 +274,7 @@
            // toolStripSeparator1
            // 
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
            // 
            // fz
            // 
@@ -304,13 +307,13 @@
            // toolStripSeparator3
            // 
            this.toolStripSeparator3.Name = "toolStripSeparator3";
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
            // 
            // toolStripSeparator8
            // 
            this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
            // 
            // mrlk
            // 
@@ -320,7 +323,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, 59);
            this.mrlk.Size = new System.Drawing.Size(60, 47);
            this.mrlk.Text = "默认列宽";
            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -330,7 +333,7 @@
            // 
            this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator7.Name = "toolStripSeparator7";
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
            // 
            // bclk
            // 
@@ -340,7 +343,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, 59);
            this.bclk.Size = new System.Drawing.Size(60, 47);
            this.bclk.Text = "保存列宽";
            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -350,7 +353,7 @@
            // 
            this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator9.Name = "toolStripSeparator9";
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
            // 
            // tc
            // 
@@ -369,7 +372,7 @@
            // toolStripSeparator5
            // 
            this.toolStripSeparator5.Name = "toolStripSeparator5";
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
            // 
            // imageList1
            // 
@@ -384,10 +387,9 @@
            this.stTab.Controls.Add(this.tabPage2);
            this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
            this.stTab.Location = new System.Drawing.Point(0, 0);
            this.stTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.stTab.Name = "stTab";
            this.stTab.SelectedIndex = 0;
            this.stTab.Size = new System.Drawing.Size(982, 619);
            this.stTab.Size = new System.Drawing.Size(737, 495);
            this.stTab.TabIndex = 15;
            // 
            // tabPage1
@@ -395,11 +397,10 @@
            this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
            this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
            this.tabPage1.Controls.Add(this.grdMain);
            this.tabPage1.Location = new System.Drawing.Point(4, 25);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Size = new System.Drawing.Size(974, 590);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage1.Size = new System.Drawing.Size(729, 469);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "列表视图";
            // 
@@ -410,14 +411,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(4, 4);
            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdMain.Location = new System.Drawing.Point(3, 3);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersVisible = false;
            this.grdMain.RowHeadersWidth = 51;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(964, 580);
            this.grdMain.Size = new System.Drawing.Size(721, 461);
            this.grdMain.TabIndex = 0;
            this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
            // 
@@ -425,6 +425,9 @@
            // 
            this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
            this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
            this.tabPage2.Controls.Add(this.txtHBadCountDevelopWHID);
            this.tabPage2.Controls.Add(this.cmdHBadCountDevelopWHID);
            this.tabPage2.Controls.Add(this.label17);
            this.tabPage2.Controls.Add(this.cmdHWasterWHID);
            this.tabPage2.Controls.Add(this.label16);
            this.tabPage2.Controls.Add(this.txtHWasterWHID);
@@ -468,31 +471,94 @@
            this.tabPage2.Controls.Add(this.label2);
            this.tabPage2.Controls.Add(this.txtHNumber);
            this.tabPage2.Controls.Add(this.label1);
            this.tabPage2.Location = new System.Drawing.Point(4, 25);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage2.Size = new System.Drawing.Size(974, 590);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage2.Size = new System.Drawing.Size(729, 469);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "单张视图";
            // 
            // cmdHWasterWHID
            // 
            this.cmdHWasterWHID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWasterWHID.Image")));
            this.cmdHWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHWasterWHID.Location = new System.Drawing.Point(487, 171);
            this.cmdHWasterWHID.Name = "cmdHWasterWHID";
            this.cmdHWasterWHID.Size = new System.Drawing.Size(22, 22);
            this.cmdHWasterWHID.TabIndex = 224;
            this.cmdHWasterWHID.UseVisualStyleBackColor = false;
            this.cmdHWasterWHID.Click += new System.EventHandler(this.cmdHWasterWHID_Click);
            // 
            // label16
            // 
            this.label16.AutoSize = true;
            this.label16.ForeColor = System.Drawing.Color.Black;
            this.label16.Location = new System.Drawing.Point(284, 176);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(41, 12);
            this.label16.TabIndex = 222;
            this.label16.Text = "报废仓";
            // 
            // txtHWasterWHID
            // 
            this.txtHWasterWHID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHWasterWHID.Location = new System.Drawing.Point(343, 172);
            this.txtHWasterWHID.Name = "txtHWasterWHID";
            this.txtHWasterWHID.Size = new System.Drawing.Size(144, 21);
            this.txtHWasterWHID.TabIndex = 223;
            this.txtHWasterWHID.Tag = "0";
            this.txtHWasterWHID.TextChanged += new System.EventHandler(this.txtHWasterWHID_TextChanged);
            // 
            // cmdHBadWHID
            // 
            this.cmdHBadWHID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadWHID.Image")));
            this.cmdHBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHBadWHID.Location = new System.Drawing.Point(221, 171);
            this.cmdHBadWHID.Name = "cmdHBadWHID";
            this.cmdHBadWHID.Size = new System.Drawing.Size(22, 22);
            this.cmdHBadWHID.TabIndex = 221;
            this.cmdHBadWHID.UseVisualStyleBackColor = false;
            this.cmdHBadWHID.Click += new System.EventHandler(this.cmdHBadWHID_Click);
            // 
            // label15
            // 
            this.label15.AutoSize = true;
            this.label15.ForeColor = System.Drawing.Color.Black;
            this.label15.Location = new System.Drawing.Point(19, 176);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(53, 12);
            this.label15.TabIndex = 219;
            this.label15.Text = "不良品仓";
            // 
            // txtHBadWHID
            // 
            this.txtHBadWHID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBadWHID.Location = new System.Drawing.Point(77, 172);
            this.txtHBadWHID.Name = "txtHBadWHID";
            this.txtHBadWHID.Size = new System.Drawing.Size(144, 21);
            this.txtHBadWHID.TabIndex = 220;
            this.txtHBadWHID.Tag = "0";
            this.txtHBadWHID.TextChanged += new System.EventHandler(this.txtHBadWHID_TextChanged);
            // 
            // txtHProcCheckNote
            // 
            this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcCheckNote.Location = new System.Drawing.Point(103, 333);
            this.txtHProcCheckNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 294);
            this.txtHProcCheckNote.Multiline = true;
            this.txtHProcCheckNote.Name = "txtHProcCheckNote";
            this.txtHProcCheckNote.Size = new System.Drawing.Size(573, 74);
            this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
            this.txtHProcCheckNote.TabIndex = 218;
            // 
            // label14
            // 
            this.label14.AutoSize = true;
            this.label14.Location = new System.Drawing.Point(25, 337);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(19, 298);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(68, 45);
            this.label14.Size = new System.Drawing.Size(53, 36);
            this.label14.TabIndex = 217;
            this.label14.Text = "本 å·¥ åº\r\n\r\n确认记录";
            // 
@@ -501,10 +567,9 @@
            this.cmdHProcMulID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHProcMulID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcMulID.Image")));
            this.cmdHProcMulID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHProcMulID.Location = new System.Drawing.Point(649, 116);
            this.cmdHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHProcMulID.Location = new System.Drawing.Point(487, 90);
            this.cmdHProcMulID.Name = "cmdHProcMulID";
            this.cmdHProcMulID.Size = new System.Drawing.Size(29, 28);
            this.cmdHProcMulID.Size = new System.Drawing.Size(22, 22);
            this.cmdHProcMulID.TabIndex = 216;
            this.cmdHProcMulID.UseVisualStyleBackColor = false;
            this.cmdHProcMulID.Click += new System.EventHandler(this.cmdHProcMulID_Click);
@@ -513,10 +578,9 @@
            // 
            this.label13.AutoSize = true;
            this.label13.ForeColor = System.Drawing.Color.Black;
            this.label13.Location = new System.Drawing.Point(386, 123);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(290, 95);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(61, 15);
            this.label13.Size = new System.Drawing.Size(47, 12);
            this.label13.TabIndex = 214;
            this.label13.Text = "å·¥   æ®µ";
            // 
@@ -524,10 +588,9 @@
            // 
            this.txtHProcMulID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHProcMulID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcMulID.Location = new System.Drawing.Point(457, 117);
            this.txtHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcMulID.Location = new System.Drawing.Point(343, 91);
            this.txtHProcMulID.Name = "txtHProcMulID";
            this.txtHProcMulID.Size = new System.Drawing.Size(191, 25);
            this.txtHProcMulID.Size = new System.Drawing.Size(144, 21);
            this.txtHProcMulID.TabIndex = 215;
            this.txtHProcMulID.Tag = "0";
            this.txtHProcMulID.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -535,29 +598,26 @@
            // txtHOverFixPrice
            // 
            this.txtHOverFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHOverFixPrice.Location = new System.Drawing.Point(457, 83);
            this.txtHOverFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHOverFixPrice.Location = new System.Drawing.Point(343, 64);
            this.txtHOverFixPrice.Name = "txtHOverFixPrice";
            this.txtHOverFixPrice.Size = new System.Drawing.Size(220, 25);
            this.txtHOverFixPrice.Size = new System.Drawing.Size(166, 21);
            this.txtHOverFixPrice.TabIndex = 213;
            // 
            // txtHFixPrice
            // 
            this.txtHFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHFixPrice.Location = new System.Drawing.Point(457, 47);
            this.txtHFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHFixPrice.Location = new System.Drawing.Point(343, 37);
            this.txtHFixPrice.Name = "txtHFixPrice";
            this.txtHFixPrice.Size = new System.Drawing.Size(220, 25);
            this.txtHFixPrice.Size = new System.Drawing.Size(166, 21);
            this.txtHFixPrice.TabIndex = 212;
            // 
            // label12
            // 
            this.label12.AutoSize = true;
            this.label12.ForeColor = System.Drawing.Color.Black;
            this.label12.Location = new System.Drawing.Point(346, 87);
            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label12.Location = new System.Drawing.Point(260, 68);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(97, 15);
            this.label12.Size = new System.Drawing.Size(77, 12);
            this.label12.TabIndex = 211;
            this.label12.Text = "加班补贴定额";
            // 
@@ -565,20 +625,18 @@
            // 
            this.label11.AutoSize = true;
            this.label11.ForeColor = System.Drawing.Color.Black;
            this.label11.Location = new System.Drawing.Point(378, 53);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(284, 41);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(67, 15);
            this.label11.Size = new System.Drawing.Size(53, 12);
            this.label11.TabIndex = 208;
            this.label11.Text = "班产定额";
            // 
            // label10
            // 
            this.label10.AutoSize = true;
            this.label10.Location = new System.Drawing.Point(378, 17);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(284, 14);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(67, 15);
            this.label10.Size = new System.Drawing.Size(53, 12);
            this.label10.TabIndex = 207;
            this.label10.Text = "汇报类型";
            // 
@@ -588,19 +646,17 @@
            this.cmbHBillSubType.Items.AddRange(new object[] {
            "设备",
            "流水线"});
            this.cmbHBillSubType.Location = new System.Drawing.Point(457, 13);
            this.cmbHBillSubType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmbHBillSubType.Location = new System.Drawing.Point(343, 10);
            this.cmbHBillSubType.Name = "cmbHBillSubType";
            this.cmbHBillSubType.Size = new System.Drawing.Size(220, 23);
            this.cmbHBillSubType.Size = new System.Drawing.Size(166, 20);
            this.cmbHBillSubType.TabIndex = 206;
            // 
            // chkHAutoTrunFlag
            // 
            this.chkHAutoTrunFlag.AutoSize = true;
            this.chkHAutoTrunFlag.Location = new System.Drawing.Point(447, 437);
            this.chkHAutoTrunFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 361);
            this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
            this.chkHAutoTrunFlag.Size = new System.Drawing.Size(89, 19);
            this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
            this.chkHAutoTrunFlag.TabIndex = 205;
            this.chkHAutoTrunFlag.Text = "自动移转";
            this.chkHAutoTrunFlag.UseVisualStyleBackColor = true;
@@ -610,10 +666,9 @@
            this.cmdHProcessID_K3.BackColor = System.Drawing.Color.Transparent;
            this.cmdHProcessID_K3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcessID_K3.Image")));
            this.cmdHProcessID_K3.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHProcessID_K3.Location = new System.Drawing.Point(649, 186);
            this.cmdHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHProcessID_K3.Location = new System.Drawing.Point(487, 144);
            this.cmdHProcessID_K3.Name = "cmdHProcessID_K3";
            this.cmdHProcessID_K3.Size = new System.Drawing.Size(29, 28);
            this.cmdHProcessID_K3.Size = new System.Drawing.Size(22, 22);
            this.cmdHProcessID_K3.TabIndex = 204;
            this.cmdHProcessID_K3.UseVisualStyleBackColor = false;
            this.cmdHProcessID_K3.Click += new System.EventHandler(this.cmdHProcessID_K3_Click);
@@ -622,10 +677,9 @@
            // 
            this.label9.AutoSize = true;
            this.label9.ForeColor = System.Drawing.Color.Black;
            this.label9.Location = new System.Drawing.Point(378, 193);
            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label9.Location = new System.Drawing.Point(284, 149);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(77, 15);
            this.label9.Size = new System.Drawing.Size(59, 12);
            this.label9.TabIndex = 202;
            this.label9.Text = "ERP å·¥ åº";
            // 
@@ -633,10 +687,9 @@
            // 
            this.txtHProcessID_K3.BackColor = System.Drawing.SystemColors.Window;
            this.txtHProcessID_K3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcessID_K3.Location = new System.Drawing.Point(457, 187);
            this.txtHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcessID_K3.Location = new System.Drawing.Point(343, 145);
            this.txtHProcessID_K3.Name = "txtHProcessID_K3";
            this.txtHProcessID_K3.Size = new System.Drawing.Size(191, 25);
            this.txtHProcessID_K3.Size = new System.Drawing.Size(144, 21);
            this.txtHProcessID_K3.TabIndex = 203;
            this.txtHProcessID_K3.Tag = "0";
            this.txtHProcessID_K3.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -644,48 +697,43 @@
            // label8
            // 
            this.label8.AutoSize = true;
            this.label8.Location = new System.Drawing.Point(25, 193);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(19, 149);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(69, 15);
            this.label8.Size = new System.Drawing.Size(53, 12);
            this.label8.TabIndex = 201;
            this.label8.Text = "序    å·";
            // 
            // txtHSNo
            // 
            this.txtHSNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSNo.Location = new System.Drawing.Point(103, 187);
            this.txtHSNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSNo.Location = new System.Drawing.Point(77, 145);
            this.txtHSNo.Name = "txtHSNo";
            this.txtHSNo.Size = new System.Drawing.Size(220, 25);
            this.txtHSNo.Size = new System.Drawing.Size(166, 21);
            this.txtHSNo.TabIndex = 200;
            // 
            // label7
            // 
            this.label7.AutoSize = true;
            this.label7.Location = new System.Drawing.Point(25, 157);
            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label7.Location = new System.Drawing.Point(19, 122);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(67, 15);
            this.label7.Size = new System.Drawing.Size(53, 12);
            this.label7.TabIndex = 199;
            this.label7.Text = "部门代码";
            // 
            // txtHDeptNumber
            // 
            this.txtHDeptNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHDeptNumber.Location = new System.Drawing.Point(103, 153);
            this.txtHDeptNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHDeptNumber.Location = new System.Drawing.Point(77, 118);
            this.txtHDeptNumber.Name = "txtHDeptNumber";
            this.txtHDeptNumber.Size = new System.Drawing.Size(220, 25);
            this.txtHDeptNumber.Size = new System.Drawing.Size(166, 21);
            this.txtHDeptNumber.TabIndex = 198;
            // 
            // chkHTypeCount
            // 
            this.chkHTypeCount.AutoSize = true;
            this.chkHTypeCount.Location = new System.Drawing.Point(333, 437);
            this.chkHTypeCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.chkHTypeCount.Location = new System.Drawing.Point(250, 361);
            this.chkHTypeCount.Name = "chkHTypeCount";
            this.chkHTypeCount.Size = new System.Drawing.Size(89, 19);
            this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
            this.chkHTypeCount.TabIndex = 197;
            this.chkHTypeCount.Text = "核算标记";
            this.chkHTypeCount.UseVisualStyleBackColor = true;
@@ -693,10 +741,9 @@
            // chkHTypeFlow
            // 
            this.chkHTypeFlow.AutoSize = true;
            this.chkHTypeFlow.Location = new System.Drawing.Point(218, 437);
            this.chkHTypeFlow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.chkHTypeFlow.Location = new System.Drawing.Point(164, 361);
            this.chkHTypeFlow.Name = "chkHTypeFlow";
            this.chkHTypeFlow.Size = new System.Drawing.Size(89, 19);
            this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
            this.chkHTypeFlow.TabIndex = 196;
            this.chkHTypeFlow.Text = "流转标记";
            this.chkHTypeFlow.UseVisualStyleBackColor = true;
@@ -704,20 +751,18 @@
            // label6
            // 
            this.label6.AutoSize = true;
            this.label6.Location = new System.Drawing.Point(25, 123);
            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label6.Location = new System.Drawing.Point(19, 95);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(68, 15);
            this.label6.Size = new System.Drawing.Size(53, 12);
            this.label6.TabIndex = 195;
            this.label6.Text = "条 å½¢ ç ";
            // 
            // txtHBarCode
            // 
            this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode.Location = new System.Drawing.Point(103, 117);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBarCode.Location = new System.Drawing.Point(77, 91);
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(220, 25);
            this.txtHBarCode.Size = new System.Drawing.Size(166, 21);
            this.txtHBarCode.TabIndex = 194;
            // 
            // cmdHDeptID
@@ -725,10 +770,9 @@
            this.cmdHDeptID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDeptID.Image")));
            this.cmdHDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHDeptID.Location = new System.Drawing.Point(649, 151);
            this.cmdHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHDeptID.Location = new System.Drawing.Point(487, 117);
            this.cmdHDeptID.Name = "cmdHDeptID";
            this.cmdHDeptID.Size = new System.Drawing.Size(29, 28);
            this.cmdHDeptID.Size = new System.Drawing.Size(22, 22);
            this.cmdHDeptID.TabIndex = 193;
            this.cmdHDeptID.UseVisualStyleBackColor = false;
            this.cmdHDeptID.Click += new System.EventHandler(this.cmdHFactoryID_Click);
@@ -737,10 +781,9 @@
            // 
            this.label28.AutoSize = true;
            this.label28.ForeColor = System.Drawing.Color.Black;
            this.label28.Location = new System.Drawing.Point(378, 157);
            this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label28.Location = new System.Drawing.Point(284, 122);
            this.label28.Name = "label28";
            this.label28.Size = new System.Drawing.Size(67, 15);
            this.label28.Size = new System.Drawing.Size(53, 12);
            this.label28.TabIndex = 191;
            this.label28.Text = "部门车间";
            // 
@@ -748,10 +791,9 @@
            // 
            this.txtHDeptID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHDeptID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHDeptID.Location = new System.Drawing.Point(457, 153);
            this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHDeptID.Location = new System.Drawing.Point(343, 118);
            this.txtHDeptID.Name = "txtHDeptID";
            this.txtHDeptID.Size = new System.Drawing.Size(191, 25);
            this.txtHDeptID.Size = new System.Drawing.Size(144, 21);
            this.txtHDeptID.TabIndex = 192;
            this.txtHDeptID.Tag = "0";
            this.txtHDeptID.TextChanged += new System.EventHandler(this.txtHFactoryID_TextChanged);
@@ -760,28 +802,25 @@
            // 
            this.txtHName.BackColor = System.Drawing.Color.Beige;
            this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHName.Location = new System.Drawing.Point(103, 47);
            this.txtHName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHName.Location = new System.Drawing.Point(77, 37);
            this.txtHName.Name = "txtHName";
            this.txtHName.Size = new System.Drawing.Size(220, 25);
            this.txtHName.Size = new System.Drawing.Size(166, 21);
            this.txtHName.TabIndex = 18;
            // 
            // label4
            // 
            this.label4.AutoSize = true;
            this.label4.Location = new System.Drawing.Point(25, 87);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(19, 68);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(68, 15);
            this.label4.Size = new System.Drawing.Size(53, 12);
            this.label4.TabIndex = 17;
            this.label4.Text = "助 è®° ç ";
            // 
            // cmdCancel
            // 
            this.cmdCancel.Location = new System.Drawing.Point(609, 487);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdCancel.Location = new System.Drawing.Point(457, 390);
            this.cmdCancel.Name = "cmdCancel";
            this.cmdCancel.Size = new System.Drawing.Size(69, 29);
            this.cmdCancel.Size = new System.Drawing.Size(52, 23);
            this.cmdCancel.TabIndex = 16;
            this.cmdCancel.Text = "取  æ¶ˆ";
            this.cmdCancel.UseVisualStyleBackColor = true;
@@ -789,10 +828,9 @@
            // 
            // cmdOK
            // 
            this.cmdOK.Location = new System.Drawing.Point(531, 487);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdOK.Location = new System.Drawing.Point(398, 390);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(69, 29);
            this.cmdOK.Size = new System.Drawing.Size(52, 23);
            this.cmdOK.TabIndex = 15;
            this.cmdOK.Text = "保  å­˜";
            this.cmdOK.UseVisualStyleBackColor = true;
@@ -801,10 +839,9 @@
            // chkHStopflag
            // 
            this.chkHStopflag.AutoSize = true;
            this.chkHStopflag.Location = new System.Drawing.Point(103, 437);
            this.chkHStopflag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.chkHStopflag.Location = new System.Drawing.Point(77, 361);
            this.chkHStopflag.Name = "chkHStopflag";
            this.chkHStopflag.Size = new System.Drawing.Size(89, 19);
            this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
            this.chkHStopflag.TabIndex = 12;
            this.chkHStopflag.Text = "禁用标志";
            this.chkHStopflag.UseVisualStyleBackColor = true;
@@ -812,39 +849,35 @@
            // txtHRemark
            // 
            this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHRemark.Location = new System.Drawing.Point(103, 249);
            this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHRemark.Location = new System.Drawing.Point(77, 227);
            this.txtHRemark.Multiline = true;
            this.txtHRemark.Name = "txtHRemark";
            this.txtHRemark.Size = new System.Drawing.Size(573, 74);
            this.txtHRemark.Size = new System.Drawing.Size(431, 60);
            this.txtHRemark.TabIndex = 10;
            // 
            // label5
            // 
            this.label5.AutoSize = true;
            this.label5.Location = new System.Drawing.Point(25, 249);
            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label5.Location = new System.Drawing.Point(19, 227);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(69, 15);
            this.label5.Size = new System.Drawing.Size(53, 12);
            this.label5.TabIndex = 9;
            this.label5.Text = "备    æ³¨";
            // 
            // txtHHelpCode
            // 
            this.txtHHelpCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHHelpCode.Location = new System.Drawing.Point(103, 83);
            this.txtHHelpCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHHelpCode.Location = new System.Drawing.Point(77, 64);
            this.txtHHelpCode.Name = "txtHHelpCode";
            this.txtHHelpCode.Size = new System.Drawing.Size(220, 25);
            this.txtHHelpCode.Size = new System.Drawing.Size(166, 21);
            this.txtHHelpCode.TabIndex = 3;
            // 
            // label2
            // 
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(25, 53);
            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label2.Location = new System.Drawing.Point(19, 41);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(69, 15);
            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 2;
            this.label2.Text = "å·¥    åº";
            // 
@@ -852,19 +885,17 @@
            // 
            this.txtHNumber.BackColor = System.Drawing.Color.Beige;
            this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHNumber.Location = new System.Drawing.Point(103, 13);
            this.txtHNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHNumber.Location = new System.Drawing.Point(77, 10);
            this.txtHNumber.Name = "txtHNumber";
            this.txtHNumber.Size = new System.Drawing.Size(220, 25);
            this.txtHNumber.Size = new System.Drawing.Size(166, 21);
            this.txtHNumber.TabIndex = 1;
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(25, 17);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(19, 14);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(67, 15);
            this.label1.Size = new System.Drawing.Size(53, 12);
            this.label1.TabIndex = 0;
            this.label1.Text = "工序代码";
            // 
@@ -876,8 +907,7 @@
            // splitContainer1
            // 
            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitContainer1.Location = new System.Drawing.Point(0, 62);
            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.splitContainer1.Location = new System.Drawing.Point(0, 50);
            this.splitContainer1.Name = "splitContainer1";
            // 
            // splitContainer1.Panel1
@@ -888,9 +918,8 @@
            // splitContainer1.Panel2
            // 
            this.splitContainer1.Panel2.Controls.Add(this.stTab);
            this.splitContainer1.Size = new System.Drawing.Size(1169, 619);
            this.splitContainer1.SplitterDistance = 182;
            this.splitContainer1.SplitterWidth = 5;
            this.splitContainer1.Size = new System.Drawing.Size(877, 495);
            this.splitContainer1.SplitterDistance = 136;
            this.splitContainer1.TabIndex = 16;
            // 
            // tv
@@ -903,18 +932,17 @@
            this.tv.Indent = 18;
            this.tv.ItemHeight = 18;
            this.tv.LineColor = System.Drawing.Color.Navy;
            this.tv.Location = new System.Drawing.Point(0, 28);
            this.tv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tv.Location = new System.Drawing.Point(0, 23);
            this.tv.Name = "tv";
            treeNode1.ForeColor = System.Drawing.Color.Black;
            treeNode1.Name = "tjbb";
            treeNode1.NodeFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            treeNode1.StateImageKey = "文件夹1.ico";
            treeNode1.Text = "项目";
            treeNode2.ForeColor = System.Drawing.Color.Black;
            treeNode2.Name = "tjbb";
            treeNode2.NodeFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            treeNode2.StateImageKey = "文件夹1.ico";
            treeNode2.Text = "项目";
            this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
            treeNode1});
            treeNode2});
            this.tv.SelectedImageIndex = 1;
            this.tv.Size = new System.Drawing.Size(182, 591);
            this.tv.Size = new System.Drawing.Size(136, 472);
            this.tv.TabIndex = 16;
            this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
            // 
@@ -925,18 +953,16 @@
            this.panel1.Controls.Add(this.label3);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(182, 28);
            this.panel1.Size = new System.Drawing.Size(136, 23);
            this.panel1.TabIndex = 15;
            // 
            // cmdLoadTree
            // 
            this.cmdLoadTree.Dock = System.Windows.Forms.DockStyle.Right;
            this.cmdLoadTree.Location = new System.Drawing.Point(125, 0);
            this.cmdLoadTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdLoadTree.Location = new System.Drawing.Point(92, 0);
            this.cmdLoadTree.Name = "cmdLoadTree";
            this.cmdLoadTree.Size = new System.Drawing.Size(53, 24);
            this.cmdLoadTree.Size = new System.Drawing.Size(40, 19);
            this.cmdLoadTree.TabIndex = 1;
            this.cmdLoadTree.Text = "刷新";
            this.cmdLoadTree.UseVisualStyleBackColor = true;
@@ -945,94 +971,53 @@
            // label3
            // 
            this.label3.AutoSize = true;
            this.label3.Location = new System.Drawing.Point(0, 4);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(0, 3);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(135, 15);
            this.label3.Size = new System.Drawing.Size(107, 12);
            this.label3.TabIndex = 0;
            this.label3.Text = "工序资料-正在浏览";
            // 
            // cmdHBadWHID
            // cmdHBadCountDevelopWHID
            // 
            this.cmdHBadWHID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadWHID.Image")));
            this.cmdHBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHBadWHID.Location = new System.Drawing.Point(295, 215);
            this.cmdHBadWHID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHBadWHID.Name = "cmdHBadWHID";
            this.cmdHBadWHID.Size = new System.Drawing.Size(29, 28);
            this.cmdHBadWHID.TabIndex = 221;
            this.cmdHBadWHID.UseVisualStyleBackColor = false;
            this.cmdHBadWHID.Click += new System.EventHandler(this.cmdHBadWHID_Click);
            this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
            this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
            this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
            this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
            this.cmdHBadCountDevelopWHID.TabIndex = 227;
            this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
            this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
            // 
            // label15
            // label17
            // 
            this.label15.AutoSize = true;
            this.label15.ForeColor = System.Drawing.Color.Black;
            this.label15.Location = new System.Drawing.Point(25, 222);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(67, 15);
            this.label15.TabIndex = 219;
            this.label15.Text = "不良品仓";
            this.label17.AutoSize = true;
            this.label17.ForeColor = System.Drawing.Color.Black;
            this.label17.Location = new System.Drawing.Point(1, 203);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(77, 12);
            this.label17.TabIndex = 225;
            this.label17.Text = "研发不良品仓";
            // 
            // txtHBadWHID
            // txtHBadCountDevelopWHID
            // 
            this.txtHBadWHID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBadWHID.Location = new System.Drawing.Point(103, 218);
            this.txtHBadWHID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBadWHID.Name = "txtHBadWHID";
            this.txtHBadWHID.Size = new System.Drawing.Size(191, 25);
            this.txtHBadWHID.TabIndex = 220;
            this.txtHBadWHID.Tag = "0";
            this.txtHBadWHID.TextChanged += new System.EventHandler(this.txtHBadWHID_TextChanged);
            // 
            // cmdHWasterWHID
            // 
            this.cmdHWasterWHID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWasterWHID.Image")));
            this.cmdHWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHWasterWHID.Location = new System.Drawing.Point(649, 217);
            this.cmdHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHWasterWHID.Name = "cmdHWasterWHID";
            this.cmdHWasterWHID.Size = new System.Drawing.Size(29, 28);
            this.cmdHWasterWHID.TabIndex = 224;
            this.cmdHWasterWHID.UseVisualStyleBackColor = false;
            this.cmdHWasterWHID.Click += new System.EventHandler(this.cmdHWasterWHID_Click);
            // 
            // label16
            // 
            this.label16.AutoSize = true;
            this.label16.ForeColor = System.Drawing.Color.Black;
            this.label16.Location = new System.Drawing.Point(379, 224);
            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(52, 15);
            this.label16.TabIndex = 222;
            this.label16.Text = "报废仓";
            // 
            // txtHWasterWHID
            // 
            this.txtHWasterWHID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHWasterWHID.Location = new System.Drawing.Point(457, 220);
            this.txtHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHWasterWHID.Name = "txtHWasterWHID";
            this.txtHWasterWHID.Size = new System.Drawing.Size(191, 25);
            this.txtHWasterWHID.TabIndex = 223;
            this.txtHWasterWHID.Tag = "0";
            this.txtHWasterWHID.TextChanged += new System.EventHandler(this.txtHWasterWHID_TextChanged);
            this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
            this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
            this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
            this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
            this.txtHBadCountDevelopWHID.TabIndex = 226;
            this.txtHBadCountDevelopWHID.Tag = "0";
            this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
            // 
            // Gy_Process
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.SystemColors.Control;
            this.ClientSize = new System.Drawing.Size(1169, 681);
            this.ClientSize = new System.Drawing.Size(877, 545);
            this.Controls.Add(this.splitContainer1);
            this.Controls.Add(this.ToolBar);
            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.Name = "Gy_Process";
            this.Text = "工序设置";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1133,5 +1118,8 @@
        private System.Windows.Forms.Button cmdHBadWHID;
        private System.Windows.Forms.Label label15;
        private System.Windows.Forms.TextBox txtHBadWHID;
        private System.Windows.Forms.TextBox txtHBadCountDevelopWHID;
        private System.Windows.Forms.Button cmdHBadCountDevelopWHID;
        private System.Windows.Forms.Label label17;
    }
}

 BaseSet/¹«ÓÃ×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.resx

@@ -253,7 +253,7 @@
  <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
        asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
        wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
        iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -263,7 +263,7 @@
  <data name="yl.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
@@ -276,7 +276,7 @@
  <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
        taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
        NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
        Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -290,7 +290,7 @@
  <data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
        USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
        h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
        NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
@@ -304,7 +304,7 @@
  <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
        ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
        SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
        bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
@@ -317,7 +317,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
@@ -329,7 +329,7 @@
  <data name="xs.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
@@ -342,7 +342,7 @@
  <data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
        mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
        WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
        MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -353,7 +353,7 @@
  <data name="jc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
        vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
        8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -364,7 +364,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
@@ -379,7 +379,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
@@ -394,7 +394,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
@@ -409,51 +409,66 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
        CgAAAk1TRnQBSQFMAgEBAgEAAWwBAQFsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
        CgAAAk1TRnQBSQFMAgEBAgEAAXQBAQF0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
        AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
        AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
        AwAB/wMAAf8DAAH/gAAE/wEAATkBigH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQ
        AbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/
        AQQBkAG5Af8DAAn/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/
        AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AwAB/wMAAf+AAAT/
        AQABOQGKAf8B0QH2Av8BSwHaAfQB/wFAAdMB8QH/ATUBywHvAf8BKwHEAe0B/wEhAb4B6wH/ARcBuAHo
        Af8BCwGwAecB/wEBAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQQBkAG5Af8DAAn/AQABOQGK
        Af8B0QH2Av8BIAG+AesB/wEaAbkB6QH/ARIBtAHnAf8BCgGwAeYB/wEDAasB5AH/AQABpwHjAf8BAAGi
        AeEB/wEAAZ8B4QH/AQQBkAG5Af8BAAE5AYoB/wMAAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AVEB3gH1
        Af8BRgHWAfMB/wE8AdAB8QH/ATEByQHuAf8BJwHCAewB/wEcAbwB6gH/ARIBtAHnAf8BBwGtAeUB/wEA
        AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/ASsBxQHuAf8BJQHB
        AesB/wEeAbwB6wH/ARYBtwHoAf8BDwGyAecB/wEHAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
        AQQBkAG5Af8DAAH/AQABOQGKAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AYEB4QH3Af8BTQHaAfQB/wFC
        AdQB8gH/ATcBzAHvAf8BLQHGAe4B/wEjAcAB6wH/ARgBuQHpAf8BDgGyAeYB/wEDAasB5QH/AQABpQHi
        Af8BAAGfAeEB/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/ATAByAHuAf8BKQHEAewB/wEiAb8B6wH/
        ARsBuwHqAf8BFAG2AegB/wEMAbAB5wH/AQUBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOQGKAf8DAAH/
        AQABOQGKAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AYYB5QH3Af8BUwHfAfUB/wFIAdgB8wH/AT4B0QHx
        Af8BMwHKAe8B/wEpAcQB7QH/AR8BvQHqAf8BFAG2AegB/wEJAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEE
        AZABuQH/AwAB/wEAATkBigH/AdEB9gL/ATwBzwHxAf8BNQHLAe8B/wEtAccB7gH/AScBwgHsAf8BIAG9
        AeoB/wEYAbkB6QH/AREBtAHnAf8BCgGwAeYB/wECAaoB5QH/AQQBkAG5Af8DAAH/AQQBkAG5Af8BBAGQ
        AbkB/wMAAf+AAAT/AQABOQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU8B3AH1Af8BRQHVAfIB/wE5
        Ac4B8AH/AS8ByAHuAf8BJQHBAewB/wEbAboB6gH/AQ8BswHnAf8BBQGsAeUB/wEAAaYB4wH/AQQBkAG5
        Af8DAAH/AQABOQGKAf8B0QH2Av8BQQHTAfIB/wE5Ac4B8AH/ATIBygHuAf8BKwHFAe0B/wElAcEB6wH/
        AR0BvAHqAf8BFgG3AegB/wEOAbIB5gH/AQcBrgHlAf8BBAGQAbkB/wMAAf8BBAGQAbkB/wEEAZABuQH/
        AwAB/4AABP8BAAE5AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVQHgAfYB/wFLAdkB8wH/AUAB0wHy
        Af8BNQHLAe8B/wErAcUB7QH/ASEBvgHrAf8BFwG4AekB/wELAbAB5gH/AQABqQHkAf8BBAGQAbkB/wMA
        Af8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEA
        ATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BBAGQAbkB/wEyAckB7gH/AQQBkAG5
        Af8DAAH/gAAE/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVIB3gH1Af8BRgHW
        AfMB/wE8Ac8B8QH/ATEByQHvAf8BJwHCAewB/wEdAbsB6QH/ARIBtQHnAf8BBwGtAeYB/wEEAZABuQH/
        AwAF/wEAATkBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFS
        Ad0B9QH/AUwB2gHzAf8BRgHXAfMB/wFBAdMB8QH/ATsBzwHxAf8BNQHLAe8B/wEEAZABuQH/AwAB/4AA
        BP8BAAE5AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
        AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BkAHr
        AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFVAeAB9gH/AVAB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
        Av8B0QH2Av8BBAGQAbkB/wMAAf+AAAT/AQABOQGKAf8BFwGoAdMB/wEXAagB0wH/ARcBqAHTAf8BFwGo
        AdMB/wEXAagB0wH/ARcBqAHTAf8BFwGoAdMB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/
        AQABOQGKAf8BAAE5AYoJ/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
        Af8BhwHlAfcB/wHRAfYC/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5
        AYoF/4AACP8BAAE5AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATkBigH/AwAh/wEAATkBigH/
        AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOQGKHf+AAAz/AQABOQGKAf8BAAE5AYoB/wEA
        ATkBigH/AQABOQGKAf8BAAE5AYoB/wMAKf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEA
        ATkBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
        AwAB/wMAAf8DAAH/gAAE/wEAATgBigH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQ
        AbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/
        AQMBkAG5Af8DAAn/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
        AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AwAB/wMAAf+AAAT/
        AQABOAGKAf8B0QH2Av8BSgHaAfQB/wE/AdMB8QH/ATQBywHvAf8BKgHEAe0B/wEgAb4B6wH/ARYBuAHo
        Af8BCgGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQMBkAG5Af8DAAn/AQABOAGK
        Af8B0QH2Av8BHwG+AesB/wEZAbkB6QH/AREBtAHnAf8BCQGwAeYB/wECAasB5AH/AQABpwHjAf8BAAGi
        AeEB/wEAAZ8B4QH/AQMBkAG5Af8BAAE4AYoB/wMAAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AVAB3gH1
        Af8BRQHWAfMB/wE7AdAB8QH/ATAByQHuAf8BJgHCAewB/wEbAbwB6gH/AREBtAHnAf8BBgGtAeUB/wEA
        AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/ASoBxQHuAf8BJAHB
        AesB/wEdAbwB6wH/ARUBtwHoAf8BDgGyAecB/wEGAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
        AQMBkAG5Af8DAAH/AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYEB4QH3Af8BTAHaAfQB/wFB
        AdQB8gH/ATYBzAHvAf8BLAHGAe4B/wEiAcAB6wH/ARcBuQHpAf8BDQGyAeYB/wECAasB5QH/AQABpQHi
        Af8BAAGfAeEB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AS8ByAHuAf8BKAHEAewB/wEhAb8B6wH/
        ARoBuwHqAf8BEwG2AegB/wELAbAB5wH/AQQBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOAGKAf8DAAH/
        AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYYB5QH3Af8BUgHfAfUB/wFHAdgB8wH/AT0B0QHx
        Af8BMgHKAe8B/wEoAcQB7QH/AR4BvQHqAf8BEwG2AegB/wEIAa8B5QH/AQABqAHjAf8BAAGiAeEB/wED
        AZABuQH/AwAB/wEAATgBigH/AdEB9gL/ATsBzwHxAf8BNAHLAe8B/wEsAccB7gH/ASYBwgHsAf8BHwG9
        AeoB/wEXAbkB6QH/ARABtAHnAf8BCQGwAeYB/wEBAaoB5QH/AQMBkAG5Af8DAAH/AQMBkAG5Af8BAwGQ
        AbkB/wMAAf+AAAT/AQABOAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU4B3AH1Af8BRAHVAfIB/wE4
        Ac4B8AH/AS4ByAHuAf8BJAHBAewB/wEaAboB6gH/AQ4BswHnAf8BBAGsAeUB/wEAAaYB4wH/AQMBkAG5
        Af8DAAH/AQABOAGKAf8B0QH2Av8BQAHTAfIB/wE4Ac4B8AH/ATEBygHuAf8BKgHFAe0B/wEkAcEB6wH/
        ARwBvAHqAf8BFQG3AegB/wENAbIB5gH/AQYBrgHlAf8BAwGQAbkB/wMAAf8BAwGQAbkB/wEDAZABuQH/
        AwAB/4AABP8BAAE4AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVAHgAfYB/wFKAdkB8wH/AT8B0wHy
        Af8BNAHLAe8B/wEqAcUB7QH/ASABvgHrAf8BFgG4AekB/wEKAbAB5gH/AQABqQHkAf8BAwGQAbkB/wMA
        Af8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
        ATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAwGQAbkB/wExAckB7gH/AQMBkAG5
        Af8DAAH/gAAE/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVEB3gH1Af8BRQHW
        AfMB/wE7Ac8B8QH/ATAByQHvAf8BJgHCAewB/wEcAbsB6QH/AREBtQHnAf8BBgGtAeYB/wEDAZABuQH/
        AwAF/wEAATgBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFR
        Ad0B9QH/AUsB2gHzAf8BRQHXAfMB/wFAAdMB8QH/AToBzwHxAf8BNAHLAe8B/wEDAZABuQH/AwAB/4AA
        BP8BAAE4AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
        AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkAHr
        AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFUAeAB9gH/AU8B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
        Av8B0QH2Av8BAwGQAbkB/wMAAf+AAAT/AQABOAGKAf8BFgGoAdMB/wEWAagB0wH/ARYBqAHTAf8BFgGo
        AdMB/wEWAagB0wH/ARYBqAHTAf8BFgGoAdMB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
        AQABOAGKAf8BAAE4AYoJ/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
        Af8BhwHlAfcB/wHRAfYC/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4
        AYoF/4AACP8BAAE4AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATgBigH/AwAh/wEAATgBigH/
        AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOAGKHf+AAAz/AQABOAGKAf8BAAE4AYoB/wEA
        ATgBigH/AQABOAGKAf8BAAE4AYoB/wMAKf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
        ATgBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
  </data>
  <data name="cmdHBadCountDevelopWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
        /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
        /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
        /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
        AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
        gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
        wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
        FIYcEAA7
</value>
  </data>
  <data name="cmdHWasterWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_Process_Ctl.cs

@@ -21,10 +21,12 @@
                oCn.RunProc("Insert into " + MvarItemKey + " " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HTypeFlow,HTypeCount,HDeptNumber,HSNo,HBadWHID,HWasterWHID" +
                    ",HBadCountDevelopWHID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
                    ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    "," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +  
                    "," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +
                    "," + oModel.HBadCountDevelopWHID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HDeptID +
                    ",'" + oModel.HBarCode + "'," + oModel.HProcessID_K3 + ",'" + oModel.HBillSubType + "'," + Convert.ToString(oModel.HAutoTrunFlag ? 1 : 0) +
                    "," + oModel.HFixPrice.ToString() + "," + oModel.HOverFixPrice.ToString() + "," + oModel.HProcMulID.ToString() +",'"+ oModel.HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -57,6 +59,7 @@
                    ",HDeptID=" + oModel.HDeptID.ToString() +
                    ",HBadWHID=" + oModel.HBadWHID.ToString() +
                    ",HWasterWHID=" + oModel.HWasterWHID.ToString() +
                    ",HBadCountDevelopWHID=" + oModel.HBadCountDevelopWHID.ToString() +
                    ",HProcessID_K3=" +oModel.HProcessID_K3+
                    ",HBillSubType='" + oModel.HBillSubType + "'" +
                    ",HDeptNumber='" + oModel.HDeptNumber + "'" +

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_Process_View.cs

@@ -123,6 +123,7 @@
                omodel.HProcCheckNote = DS.Tables[0].Rows[0]["HProcCheckNote"].ToString().Trim();
                omodel.HBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadWHID"]);
                omodel.HWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWasterWHID"]);
                omodel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadCountDevelopWHID"]);
                return true;
            }
            catch (Exception e)

 LMES/bin/x86/Debug.zip

Binary files differ

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Process_Model.cs

@@ -23,5 +23,6 @@
        public string HProcCheckNote = "";//本工序确认记录
        public Int64 HBadWHID;//New
        public Int64 HWasterWHID;//New
        public Int64 HBadCountDevelopWHID;//研发不良品仓库New
    }
}

 WebAPI/Controllers/ReportFromController.cs

@@ -296,6 +296,120 @@
            return objJsonResult;
        }
        #endregion


        #region [器具收发料明细报表列表]
        [Route("Sc_MESReportFrom/ReportMaterialReceiptBillList")]
        [HttpGet]
        public object ReportMaterialReceiptBillList(int page, int limit, string HStartDate,string HEndDate, string HNumber, string HBarCode, string HSupName)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                int count = 0;
                int pageNum = page;
                int pageSize = limit;


                ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceipt '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceipt");
                string aa = ds.Tables[0].Columns[0].ToString();

                foreach (DataColumn col in ds.Tables[1].Columns)
                {

                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds.Tables[1].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = ds.Tables[0].Rows.Count;
                    objJsonResult.Message = "获取资源绑定数据成功！";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式，然后再反序列化回来
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据！";
                    objJsonResult.data = null;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion

        #region [器具收发料汇总报表列表]
        [Route("Sc_MESReportFrom/ReportMaterialReceiptBillSumList")]
        [HttpGet]
        public object ReportMaterialReceiptBillSumList(int page, int limit, string HStartDate, string HEndDate, string HNumber, string HSupName)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                int count = 0;
                int pageNum = page;
                int pageSize = limit;


                ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceiptSum '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceiptSum");
                string aa = ds.Tables[0].Columns[0].ToString();

                foreach (DataColumn col in ds.Tables[1].Columns)
                {

                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds.Tables[1].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = ds.Tables[0].Rows.Count;
                    objJsonResult.Message = "获取资源绑定数据成功！";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式，然后再反序列化回来
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据！";
                    objJsonResult.data = null;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion

    }
}
    

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationOutBillList_Bad.designer.cs

@@ -241,6 +241,7 @@
            this.cx,
            this.sx,
            this.toolStripSeparator1,
            this.bzd,
            this.xz,
            this.dj,
            this.sc,
@@ -248,7 +249,6 @@
            this.sh,
            this.qsh,
            this.toolStripSeparator6,
            this.bzd,
            this.toolStripSeparator4,
            this.tc,
            this.toolStripSeparator3,

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationOutBillList_Bad.resx

@@ -3975,6 +3975,16 @@
        GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
  </data>
  <data name="bzd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
        u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -4037,16 +4047,6 @@
        GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
        XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
        PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
</value>
  </data>
  <data name="bzd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
        u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">