From 7bdee5dbfa89ea8a323166c2d844da5af7a30fb7 Mon Sep 17 00:00:00 2001 From: "hao.jin" Date: Sun, 29 May 2022 16:59:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=B7=E7=A0=81=E9=A2=84=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=9C=A8=E9=80=94=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E5=88=A4=E6=96=AD=E7=BB=93=E6=9E=9C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicData/frmBaseMain.Designer.cs | 40 ++++++++++--------- .../Stone.WinModule/BasicData/frmBaseMain.cs | 4 -- .../BasicData/frmBaseMain.resx | 22 +++++----- .../Stone.WinModule/Standard/frmJISVDA.cs | 22 +++++++++- .../Stone.WinModule/Standard/frmJISVDA.resx | 8 ++-- 5 files changed, 56 insertions(+), 40 deletions(-) diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.Designer.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.Designer.cs index 1d65005..fca63bf 100644 --- a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.Designer.cs +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.Designer.cs @@ -62,7 +62,7 @@ this.tlbOutPut.Image = ((System.Drawing.Image)(resources.GetObject("tlbOutPut.Image"))); this.tlbOutPut.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbOutPut.Name = "tlbOutPut"; - this.tlbOutPut.Size = new System.Drawing.Size(36, 37); + this.tlbOutPut.Size = new System.Drawing.Size(50, 52); this.tlbOutPut.Text = "导出"; this.tlbOutPut.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbOutPut.Click += new System.EventHandler(this.tlbOutPut_Click); @@ -83,7 +83,7 @@ this.txtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtCode.Location = new System.Drawing.Point(682, 8); this.txtCode.Name = "txtCode"; - this.txtCode.Size = new System.Drawing.Size(111, 21); + this.txtCode.Size = new System.Drawing.Size(111, 28); this.txtCode.TabIndex = 13; this.txtCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown); // @@ -92,7 +92,7 @@ this.tlbExit.Image = ((System.Drawing.Image)(resources.GetObject("tlbExit.Image"))); this.tlbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbExit.Name = "tlbExit"; - this.tlbExit.Size = new System.Drawing.Size(36, 37); + this.tlbExit.Size = new System.Drawing.Size(50, 52); this.tlbExit.Text = "关闭"; this.tlbExit.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbExit.Click += new System.EventHandler(this.tlbExit_Click); @@ -104,13 +104,13 @@ this.dgrdView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgrdView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgrdView.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgrdView.Location = new System.Drawing.Point(0, 40); + this.dgrdView.Location = new System.Drawing.Point(0, 55); this.dgrdView.MultiSelect = false; this.dgrdView.Name = "dgrdView"; this.dgrdView.ReadOnly = true; this.dgrdView.RowTemplate.Height = 23; this.dgrdView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgrdView.Size = new System.Drawing.Size(881, 497); + this.dgrdView.Size = new System.Drawing.Size(881, 480); this.dgrdView.TabIndex = 15; this.dgrdView.DoubleClick += new System.EventHandler(this.dgrdView_DoubleClick); // @@ -125,13 +125,14 @@ this.tlbInput.Image = ((System.Drawing.Image)(resources.GetObject("tlbInput.Image"))); this.tlbInput.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbInput.Name = "tlbInput"; - this.tlbInput.Size = new System.Drawing.Size(36, 37); + this.tlbInput.Size = new System.Drawing.Size(50, 52); this.tlbInput.Text = "导入"; this.tlbInput.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbInput.Click += new System.EventHandler(this.tlbInput_Click); // // toolStrip1 // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tlbAdd, this.tlbAddCopy, @@ -152,7 +153,7 @@ this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 0, 200, 0); this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip1.Size = new System.Drawing.Size(881, 40); + this.toolStrip1.Size = new System.Drawing.Size(881, 55); this.toolStrip1.TabIndex = 14; this.toolStrip1.Text = "toolStrip1"; // @@ -161,7 +162,7 @@ this.tlbAdd.Image = ((System.Drawing.Image)(resources.GetObject("tlbAdd.Image"))); this.tlbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbAdd.Name = "tlbAdd"; - this.tlbAdd.Size = new System.Drawing.Size(36, 37); + this.tlbAdd.Size = new System.Drawing.Size(50, 52); this.tlbAdd.Text = "新增"; this.tlbAdd.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbAdd.Click += new System.EventHandler(this.tlbAdd_Click); @@ -171,7 +172,7 @@ this.tlbAddCopy.Image = ((System.Drawing.Image)(resources.GetObject("tlbAddCopy.Image"))); this.tlbAddCopy.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbAddCopy.Name = "tlbAddCopy"; - this.tlbAddCopy.Size = new System.Drawing.Size(60, 37); + this.tlbAddCopy.Size = new System.Drawing.Size(86, 52); this.tlbAddCopy.Text = "复制新增"; this.tlbAddCopy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbAddCopy.Click += new System.EventHandler(this.tlbAddCopy_Click); @@ -181,7 +182,7 @@ this.tlbEdit.Image = ((System.Drawing.Image)(resources.GetObject("tlbEdit.Image"))); this.tlbEdit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbEdit.Name = "tlbEdit"; - this.tlbEdit.Size = new System.Drawing.Size(36, 37); + this.tlbEdit.Size = new System.Drawing.Size(50, 52); this.tlbEdit.Text = "修改"; this.tlbEdit.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbEdit.Click += new System.EventHandler(this.tlbEdit_Click); @@ -191,7 +192,7 @@ this.tlbDelete.Image = ((System.Drawing.Image)(resources.GetObject("tlbDelete.Image"))); this.tlbDelete.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbDelete.Name = "tlbDelete"; - this.tlbDelete.Size = new System.Drawing.Size(36, 37); + this.tlbDelete.Size = new System.Drawing.Size(50, 52); this.tlbDelete.Text = "删除"; this.tlbDelete.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbDelete.Click += new System.EventHandler(this.tlbDelete_Click); @@ -207,7 +208,7 @@ this.tlbFilter.Image = ((System.Drawing.Image)(resources.GetObject("tlbFilter.Image"))); this.tlbFilter.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbFilter.Name = "tlbFilter"; - this.tlbFilter.Size = new System.Drawing.Size(36, 37); + this.tlbFilter.Size = new System.Drawing.Size(50, 52); this.tlbFilter.Text = "查询"; this.tlbFilter.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbFilter.Click += new System.EventHandler(this.tlbFilter_Click); @@ -218,7 +219,7 @@ this.tlbSelect.Image = ((System.Drawing.Image)(resources.GetObject("tlbSelect.Image"))); this.tlbSelect.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbSelect.Name = "tlbSelect"; - this.tlbSelect.Size = new System.Drawing.Size(36, 37); + this.tlbSelect.Size = new System.Drawing.Size(50, 52); this.tlbSelect.Text = "选择"; this.tlbSelect.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbSelect.Click += new System.EventHandler(this.tlbSelect_Click); @@ -228,7 +229,7 @@ this.tlbRefresh.Image = ((System.Drawing.Image)(resources.GetObject("tlbRefresh.Image"))); this.tlbRefresh.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbRefresh.Name = "tlbRefresh"; - this.tlbRefresh.Size = new System.Drawing.Size(36, 37); + this.tlbRefresh.Size = new System.Drawing.Size(50, 52); this.tlbRefresh.Text = "刷新"; this.tlbRefresh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbRefresh.Click += new System.EventHandler(this.tlbRefresh_Click); @@ -244,7 +245,7 @@ this.tlbSet.Image = ((System.Drawing.Image)(resources.GetObject("tlbSet.Image"))); this.tlbSet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tlbSet.Name = "tlbSet"; - this.tlbSet.Size = new System.Drawing.Size(36, 37); + this.tlbSet.Size = new System.Drawing.Size(50, 52); this.tlbSet.Text = "设置"; this.tlbSet.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tlbSet.Click += new System.EventHandler(this.tlbSet_Click); @@ -260,28 +261,29 @@ this.pageBar.CountItem = null; this.pageBar.DeleteItem = null; this.pageBar.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar.ImageScalingSize = new System.Drawing.Size(24, 24); this.pageBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tlbAllCount}); - this.pageBar.Location = new System.Drawing.Point(0, 537); + this.pageBar.Location = new System.Drawing.Point(0, 535); this.pageBar.MoveFirstItem = null; this.pageBar.MoveLastItem = null; this.pageBar.MoveNextItem = null; this.pageBar.MovePreviousItem = null; this.pageBar.Name = "pageBar"; this.pageBar.PositionItem = null; - this.pageBar.Size = new System.Drawing.Size(881, 25); + this.pageBar.Size = new System.Drawing.Size(881, 27); this.pageBar.TabIndex = 18; this.pageBar.Text = "bindingNavigator1"; // // tlbAllCount // this.tlbAllCount.Name = "tlbAllCount"; - this.tlbAllCount.Size = new System.Drawing.Size(63, 22); + this.tlbAllCount.Size = new System.Drawing.Size(93, 24); this.tlbAllCount.Text = "记录数：0"; // // frmBaseMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.ClientSize = new System.Drawing.Size(881, 562); this.Controls.Add(this.dgrdView); this.Controls.Add(this.pageBar); diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs index 14c8676..edcd2e6 100644 --- a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs @@ -287,10 +287,6 @@ namespace Stone.WinModule.BasicData m_Base.BindPageData(strWhere); m_Base.GetView(this.dgrdView); this.tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count; - - - - } /// diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.resx b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.resx index 0d377cd..328ef96 100644 --- a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.resx +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAq4SURBVGhD7Zl3VFRnGsY9Z7Mhq0bAvvYSjau70bUmrkZj + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAq4SURBVGhD7Zl3VFRnGsY9Z7Mhq0bAvvYSjau70bUmrkZj YuwtosbuWhJXXTXWGF0LSozB3lBE0ag0JViwKxY0ipVehjKASIcBpA7gs+/7zb14uQ7KjLpn/8h3zvOH 5yDz/O7zlvsNVX4//8/HSwurY5HFzh6RxfDQFMOdFVEMN1nheriSXFhhehxlhRbhCCukCIcl/RJcKHQo yKCD/gVezsG5HaSPeXvHXaP38ooqhjb7GVLznyGFlVexktXKLS1TkqS47FKc1BTBIaBA5/SoYIr0UW/n @@ -173,7 +173,7 @@ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAABq8SURBVHhe7Zp3eFRl1sAVQYoKKIr0KhZARAXpIEWkKtgF + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAABq8SURBVHhe7Zp3eFRl1sAVQYoKKIr0KhZARAXpIEWkKtgF +7rWVde1rOvnrq7uuru2tfe2upZ17bIrRZEkJJm0SULqTMr0XpJJCCGhnO93bmYkgdzglu/5/vF9nt8z ydw7c+/5vee85SaH/Nh+QOt+yCGi9IDDfyD/yrmd0dXn9dj+6Pt6j4clSd76f9aG8kUr4cWJE+XLtWvl 2//5H9ny+9/Llt/9TtIg/dFH2/jDHyT9j3+UjD/9STIee0wyHn9ctj7xxD6eesog689/lqynn5asZ54x @@ -293,7 +293,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAq/SURBVGhD7Zl5VBRnFsU9ZzIxo0YgMsZRI3GNiZnEuCaO + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAq/SURBVGhD7Zl5VBRnFsU9ZzIxo0YgMsZRI3GNiZnEuCaO RmPiuMUtbnED9zDqKK6jE2MUJYli3BVFFDcUFwZxQ1FQQaOiKDtNQ9Psu7LI1g14572vq7C7BW0aPSd/ 5Dvn/sE5RdX91X3fe1XV9f5Yv+flrYblybhy9xNx5TihLMdxVmw5PGUptDhGOsqK0cKDFa3BEVaUBocl HYosEzoYodOB0FJv98iiztJlXt06rtR6e8eXQ13wBNklT5DFKq5ZmcYqqqxShqSkgkr4KDVwCSvNc3tQ @@ -348,7 +348,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACxSURBVDhPrZAxDsMgDEU5Uo/RY/RI3KCM3crY0WO2eszI + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACxSURBVDhPrZAxDsMgDEU5Uo/RY/RI3KCM3crY0WO2eszI 2JGxm8uPTNSQAImUJ1kM5j9bNqfhKci6WPyLxXmW+/Nt9es2CNRwD5LL9daWYFoNmwQ0cFuCVWtY56dw Lo0scQ0BgCSLNLIEh6oRv6li7AlIvxdoOHx6gnSoLTAd4RA6Aly6JK8OAY89QWqWpOw8ncdwTDBPn8JR iI8I/leHIIVp2CnA26qmAM09pZEzMOYHrLvyreChWskAAAAASUVORK5CYII= @@ -357,7 +357,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADRSURBVDhPrZKxEYMwDEUZiTFSZgRGyQgewWVKl5QuKV2m + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADRSURBVDhPrZKxEYMwDEUZiTFSZgRGyQgewWVKl5QuKV2m VElJSadINrIdkIEiuvvnk/T1xNl0rXAe8KiA1gUMH8DNdgwYe8TFIPghnZQva8iyb4/9YyiQ/ZY8NLt4 cl4DDAH8FAqEh2oD+GccpskE4bzqG+visIgApcm6+oLoWWkBKQHG32Ycml8Ik34HogywO4DIOq/WRQVA z6IZ+La1uuifAN3Iz6XVRQXQMPJzaXVRBrQ23Qc0jFJno670S58C2HClDNC3sLZNrbi9SY2u+wL3h/dn @@ -367,7 +367,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFISURBVDhPrZKvUsQwEIf7CH0DeAJaCQ7HDaaRNwh6Ekck + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFISURBVDhPrZKvUsQwEIf7CH0DeAJaCQ7HDaaRNwh6Ekck gyHyZOQ5VtYRWUfkOVYi8wiRuCWbpEBKi+Kb2Znrn++3281V/4qxjsrCVCMSGKTnlzedX12GpTVgsCTu 1N8h3I3xIxTF6BBgj0iXW7kewqOuocFEeaqslEAO8EaXNeh4HxHjFM1Vr7JSwotaw3+E8p6sMWTkLtbr Y99mNcGLii//6OxBk+M6KEIDUXRaEj6kkKwmpoA53N29h/GNikeKexllfd6WAbzpKMw7jybIkrwL10dJ @@ -379,7 +379,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEmSURBVDhPrZGtU8QwEMXzJ1TiqOxgqERWIiORkchK5MmT + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEmSURBVDhPrZGtU8QwEMXzJ1TiqOxgqERWIiORkchK5MmT lScjkZHniOMckScrcUSee7xNe9ByaUGwM2863dn324+ofwvne1wqwO0DrAt4eX0zY2k+xBBPISv77FHf G4E0Y/llSLecWdQR4A9hHSKj5syizrpkPmu0zMOuAEQ4uaRlAA+VCncbYGuA3mchK4DBAEvAk6YIObo5 wHcI7RKAh/outANAQAeLGJnbtunf6AWAXHrW7cCdE4TaUC1h73Z5Bbn0FJAggZDHBjAUJ1m9wU+A7I+O @@ -390,7 +390,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGZSURBVDhPfZOhbsMwFEX7CfuDFQ9s5pUasw1UmtlK2hgG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGZSURBVDhPfZOhbsMwFEX7CfuDFQ9s5pUasw1UmtlK2hgG LWYri2FZDcNqWDZrqGyBYzMsDBwMHLt7Tp1VSbtd6SmRnHOe/eSMLsVVNc7Lw+09rPPYvn6a+OnlBOCv 2F0F9iD/lwRB8422hjEkqD78uSR/3/CpW3pmOfhOQO11RPox1rVwVy2cbNOr2dussbWD+6qgKw1uLIk0 7aKJ6ClB0olawXWZGLnnMAdFsIUsPYTxGO84FMkupScYlwKi5BC0dUmgXDdgpcK4ZOBWRuSUMJuegBkJ @@ -403,7 +403,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEJSURBVDhP3ZAhcoQwFIY5AjdoNDMt3GBxrWBKVGdNdzkB + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEJSURBVDhP3ZAhcoQwFIY5AjdoNDMt3GBxrWBKVGdNdzkB Qa4Lch1xrEtkHXFdt3GV5AabG/BukCZM2oplptj2c/nf+15eEv0t+PuE+BlYSS4iROsp6TWmHCRulKV8 rEK8Di+TkzG5l5kGfr7iUPqdko5xzQx4uT4qGD6mNpR+4BebdcPUhOM3XzI+aFsc5LLs6SQY9gaWCNAh mmXSG1Udtb1/EWZQIEPplmQrALfGVswNOYF0MiI9zHLyKuHusUOhdZm05CjDwvpV/RC/9nzzTpp0y2+e @@ -414,7 +414,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADqSURBVDhPrZEhEoMwEEW5AbKyV+AIyEpkJbLH4AjIysjK + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADqSURBVDhPrZEhEoMwEEW5AbKyV+AIyEpkJbLH4AjIysjK SGQkMhIZWbmybrs/hE6YQoLgz+wsTPLfLp/iNGnj+L8s68Gy0pbLsqzC1W3BsCf1Mlzd2jQE0/akB8Nm tDPkcq2DZS2sutKHmaTaR8fGOt8BQAXLWioC0JvE0HMjpqbtfpBe6QRAglpU3zt/2QkIAHQiygFMsM8A +tD8gk8RMyBpgCS9JRgBdC4D6CMAJvrVYXpqD7BTDiCHixAaAD5ECRMB2ikTYgzAZECwvpVnTM/+hRgQ @@ -424,7 +424,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjGSURBVGhD7Zh7UFNnGsajLMVbBXERUREQuYOBCARBCvVe + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjGSURBVGhD7Zh7UFNnGsajLMVbBXERUREQuYOBCARBCvVe adGiq2hZRdt1pu6utt2Zdp2pK9BpKerYVne2Trs1WlQqF4Niod6IiGBJhAgKGJKTEAGBQDyAIMjt2e8L CcJKXXcGAn/4zDwzGeacw/M73/u935twXuql+oSN/JiuyAAVIgNgcM9GvpD8PVR/ydgUtoZYdG/kS7F5 EZCwGzhzGEg+AsRFA1uD+kAiAwT6y8eW+sNHLwFyzgE1CqBWBdTfBxpqANEZ4P0QCoCudf5jCwJruLrw diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs index b49ec89..c824a71 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs @@ -56,12 +56,11 @@ namespace Stone.WinModule.Standard strWhere += " [filename] like '%" + code + "%' "; } + strWhere = "[IsStandard]=1 and [startDate]>='" + d1 + "' and [startDate]<='" + d2 + "' and (" + strWhere + ")"; if (cbIsDiff.Checked) { strWhere += " and quantity > quantity_print "; } - strWhere = "[IsStandard]=1 and [startDate]>='" + d1 + "' and [startDate]<='" + d2 + "' and (" + strWhere + ")"; - } private void frmJISLog_Load(object sender, EventArgs e) @@ -378,6 +377,14 @@ namespace Stone.WinModule.Standard Odd = Convert.ToInt32(drData["quantity"]) - Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头 } + else + { + PageQty = Convert.ToInt32(Math.Floor(Convert.ToDecimal(drData["quantity_new"]) / + Convert.ToDecimal(drData["PackNumer"]))); + + Odd = Convert.ToInt32(drData["quantity_new"]) - + Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头 + } for (int i = 1; i <= PageQty; i++) @@ -499,6 +506,17 @@ namespace Stone.WinModule.Standard } } + // public virtual void UpdateGridView() + // { + // + // string code = this.txtCode.Text.Trim(); + // Search(code); + // + // m_Base.BindPageData(strWhere); + // m_Base.GetView(this.dgrdView); + // tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count; + // } + private void chkAuto_CheckedChanged(object sender, EventArgs e) { diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.resx b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.resx index 7487b59..2c47763 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.resx +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.resx @@ -118,17 +118,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 227, 17 + 301, 17 - 317, 17 + 420, 17 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA8 - CQAAAk1TRnQBSQFMAgEBAgEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -171,6 +171,6 @@ - 432, 17 + 577, 17 \ No newline at end of file