雅琪诺MES智能条码管理系统
parent: 71574648 | 补丁 | 提交 | ignore whitespace
jingh
2021-04-01 a216d94a3fd8cd388545c0cefbb5c48aad773ec3 
报表修正
4个文件已修改
269 ■■■■■ 已修改文件
SCM/单据资料/Gy_BarCodeMain.Designer.cs 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Gy_BarCodeMain.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/报表/Qk_ProcessBillDetail.Designer.cs 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/报表/Qk_ProcessBillDetail.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.Designer.cs


@@ -32,6 +32,7 @@


            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeMain));


            this.grdMain = new System.Windows.Forms.DataGridView();


            this.groupBox1 = new System.Windows.Forms.GroupBox();


            this.grdSum = new System.Windows.Forms.DataGridView();


            this.comboBox1 = new System.Windows.Forms.ComboBox();


            this.label8 = new System.Windows.Forms.Label();


            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();


@@ -56,13 +57,16 @@


            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();


            this.tc = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();


            this.grdSum = new System.Windows.Forms.DataGridView();


            this.textBox7 = new System.Windows.Forms.TextBox();


            this.label12 = new System.Windows.Forms.Label();


            this.textBox3 = new System.Windows.Forms.TextBox();


            this.label10 = new System.Windows.Forms.Label();


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();


            this.groupBox1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();


            this.pPic.SuspendLayout();


            this.panel1.SuspendLayout();


            this.Tool.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();


            this.SuspendLayout();


            // 


            // grdMain


@@ -72,18 +76,22 @@


            this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;


            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdMain.Location = new System.Drawing.Point(0, 275);


            this.grdMain.Location = new System.Drawing.Point(0, 322);


            this.grdMain.Margin = new System.Windows.Forms.Padding(4);


            this.grdMain.Name = "grdMain";


            this.grdMain.ReadOnly = true;


            this.grdMain.RowHeadersWidth = 51;


            this.grdMain.RowTemplate.Height = 23;


            this.grdMain.Size = new System.Drawing.Size(1277, 350);


            this.grdMain.Size = new System.Drawing.Size(1277, 303);


            this.grdMain.TabIndex = 57;


            // 


            // groupBox1


            // 


            this.groupBox1.BackColor = System.Drawing.Color.Lavender;


            this.groupBox1.Controls.Add(this.textBox7);


            this.groupBox1.Controls.Add(this.label12);


            this.groupBox1.Controls.Add(this.textBox3);


            this.groupBox1.Controls.Add(this.label10);


            this.groupBox1.Controls.Add(this.grdSum);


            this.groupBox1.Controls.Add(this.comboBox1);


            this.groupBox1.Controls.Add(this.label8);


@@ -102,10 +110,27 @@


            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);


            this.groupBox1.Name = "groupBox1";


            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);


            this.groupBox1.Size = new System.Drawing.Size(1277, 172);


            this.groupBox1.Size = new System.Drawing.Size(1277, 219);


            this.groupBox1.TabIndex = 56;


            this.groupBox1.TabStop = false;


            this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);


            // 


            // grdSum


            // 


            this.grdSum.AllowUserToAddRows = false;


            this.grdSum.AllowUserToDeleteRows = false;


            this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;


            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.grdSum.Location = new System.Drawing.Point(4, 191);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4);


            this.grdSum.Name = "grdSum";


            this.grdSum.ReadOnly = true;


            this.grdSum.RowHeadersWidth = 51;


            this.grdSum.RowTemplate.Height = 23;


            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;


            this.grdSum.Size = new System.Drawing.Size(1269, 24);


            this.grdSum.TabIndex = 51;


            // 


            // comboBox1


            // 


@@ -361,22 +386,41 @@


            this.toolStripSeparator9.Name = "toolStripSeparator9";


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);


            // 


            // grdSum


            // textBox7


            // 


            this.grdSum.AllowUserToAddRows = false;


            this.grdSum.AllowUserToDeleteRows = false;


            this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;


            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.grdSum.Location = new System.Drawing.Point(4, 144);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4);


            this.grdSum.Name = "grdSum";


            this.grdSum.ReadOnly = true;


            this.grdSum.RowHeadersWidth = 51;


            this.grdSum.RowTemplate.Height = 23;


            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;


            this.grdSum.Size = new System.Drawing.Size(1269, 24);


            this.grdSum.TabIndex = 51;


            this.textBox7.Location = new System.Drawing.Point(365, 108);


            this.textBox7.Margin = new System.Windows.Forms.Padding(4);


            this.textBox7.Name = "textBox7";


            this.textBox7.Size = new System.Drawing.Size(172, 25);


            this.textBox7.TabIndex = 55;


            // 


            // label12


            // 


            this.label12.AutoSize = true;


            this.label12.Location = new System.Drawing.Point(305, 110);


            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label12.Name = "label12";


            this.label12.Size = new System.Drawing.Size(52, 15);


            this.label12.TabIndex = 54;


            this.label12.Text = "材质：";


            // 


            // textBox3


            // 


            this.textBox3.Location = new System.Drawing.Point(96, 110);


            this.textBox3.Margin = new System.Windows.Forms.Padding(4);


            this.textBox3.Name = "textBox3";


            this.textBox3.Size = new System.Drawing.Size(172, 25);


            this.textBox3.TabIndex = 53;


            // 


            // label10


            // 


            this.label10.AutoSize = true;


            this.label10.Location = new System.Drawing.Point(18, 112);


            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label10.Name = "label10";


            this.label10.Size = new System.Drawing.Size(52, 15);


            this.label10.TabIndex = 52;


            this.label10.Text = "工艺：";


            // 


            // Gy_BarCodeMain


            // 


@@ -394,13 +438,13 @@


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();


            this.groupBox1.ResumeLayout(false);


            this.groupBox1.PerformLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();


            this.pPic.ResumeLayout(false);


            this.pPic.PerformLayout();


            this.panel1.ResumeLayout(false);


            this.panel1.PerformLayout();


            this.Tool.ResumeLayout(false);


            this.Tool.PerformLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();


            this.ResumeLayout(false);




        }


@@ -434,5 +478,9 @@


        private System.Windows.Forms.ComboBox comboBox1;


        private System.Windows.Forms.Label label8;


        private System.Windows.Forms.DataGridView grdSum;


        private System.Windows.Forms.TextBox textBox7;


        private System.Windows.Forms.Label label12;


        private System.Windows.Forms.TextBox textBox3;


        private System.Windows.Forms.Label label10;


    }


}




 SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.cs


@@ -46,11 +46,15 @@


            }


            whereBuilder.Append(" and c.HMakeDate>''" + dateTimePicker1.Text+ "'' and c.HMakeDate<''" + dateTimePicker2.Text+" ''");


            if (!string.IsNullOrEmpty(txtHBillNo.Text))


                whereBuilder.Append(" and a.FBILLNO like ''%" + txtHBillNo.Text+"%''");


                whereBuilder.Append(" and a.FBILLNO like ''%" + txtHBillNo.Text +"%''");


            if (!string.IsNullOrEmpty(textBox1.Text))


                whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''");


                whereBuilder.Append(" and e.FNUMBER like ''%"+ textBox1.Text +"%''");


            if (!string.IsNullOrEmpty(textBox2.Text))


                whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''");


                whereBuilder.Append(" and c.HMaterName like ''%"+ textBox2.Text +"%''"); 


            if (!string.IsNullOrEmpty(textBox3.Text))


                whereBuilder.Append(" and h.FDATAVALUE like ''%" + textBox3.Text + "%''");


            if (!string.IsNullOrEmpty(textBox7.Text))


                whereBuilder.Append(" and i.FDATAVALUE like ''%" + textBox7.Text + "%''");


            if (comboBox1.Text == "已检验")


                whereBuilder.Append(" and c.HMaterName is not null");


            else if(comboBox1.Text=="未检验")




 SCM/±¨±í/Qk_ProcessBillDetail.Designer.cs


@@ -36,6 +36,7 @@


            this.textBox4 = new System.Windows.Forms.TextBox();


            this.label8 = new System.Windows.Forms.Label();


            this.groupBox1 = new System.Windows.Forms.GroupBox();


            this.grdSum = new System.Windows.Forms.DataGridView();


            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();


            this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();


            this.label9 = new System.Windows.Forms.Label();


@@ -53,11 +54,20 @@


            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();


            this.tc = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();


            this.grdSum = new System.Windows.Forms.DataGridView();


            this.txtHGroupName = new System.Windows.Forms.TextBox();


            this.label5 = new System.Windows.Forms.Label();


            this.txtHProcName = new System.Windows.Forms.TextBox();


            this.label6 = new System.Windows.Forms.Label();


            this.txtHFModel = new System.Windows.Forms.TextBox();


            this.label7 = new System.Windows.Forms.Label();


            this.label10 = new System.Windows.Forms.Label();


            this.txtHBQty = new System.Windows.Forms.TextBox();


            this.txtHEQty = new System.Windows.Forms.TextBox();


            this.label12 = new System.Windows.Forms.Label();


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();


            this.groupBox1.SuspendLayout();


            this.Tool.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();


            this.Tool.SuspendLayout();


            this.SuspendLayout();


            // 


            // label3


@@ -75,7 +85,7 @@


            this.textBox3.Location = new System.Drawing.Point(908, 75);


            this.textBox3.Margin = new System.Windows.Forms.Padding(4);


            this.textBox3.Name = "textBox3";


            this.textBox3.Size = new System.Drawing.Size(172, 25);


            this.textBox3.Size = new System.Drawing.Size(212, 25);


            this.textBox3.TabIndex = 35;


            // 


            // grdMain


@@ -85,13 +95,13 @@


            this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;


            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdMain.Location = new System.Drawing.Point(0, 242);


            this.grdMain.Location = new System.Drawing.Point(0, 278);


            this.grdMain.Margin = new System.Windows.Forms.Padding(4);


            this.grdMain.Name = "grdMain";


            this.grdMain.ReadOnly = true;


            this.grdMain.RowHeadersWidth = 51;


            this.grdMain.RowTemplate.Height = 23;


            this.grdMain.Size = new System.Drawing.Size(1220, 378);


            this.grdMain.Size = new System.Drawing.Size(1220, 342);


            this.grdMain.TabIndex = 62;


            // 


            // textBox4


@@ -115,6 +125,16 @@


            // groupBox1


            // 


            this.groupBox1.BackColor = System.Drawing.Color.Lavender;


            this.groupBox1.Controls.Add(this.label12);


            this.groupBox1.Controls.Add(this.txtHEQty);


            this.groupBox1.Controls.Add(this.txtHBQty);


            this.groupBox1.Controls.Add(this.label10);


            this.groupBox1.Controls.Add(this.txtHFModel);


            this.groupBox1.Controls.Add(this.label7);


            this.groupBox1.Controls.Add(this.txtHProcName);


            this.groupBox1.Controls.Add(this.label6);


            this.groupBox1.Controls.Add(this.txtHGroupName);


            this.groupBox1.Controls.Add(this.label5);


            this.groupBox1.Controls.Add(this.grdSum);


            this.groupBox1.Controls.Add(this.textBox4);


            this.groupBox1.Controls.Add(this.label3);


@@ -135,9 +155,26 @@


            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);


            this.groupBox1.Name = "groupBox1";


            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);


            this.groupBox1.Size = new System.Drawing.Size(1220, 180);


            this.groupBox1.Size = new System.Drawing.Size(1220, 216);


            this.groupBox1.TabIndex = 61;


            this.groupBox1.TabStop = false;


            // 


            // grdSum


            // 


            this.grdSum.AllowUserToAddRows = false;


            this.grdSum.AllowUserToDeleteRows = false;


            this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;


            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.grdSum.Location = new System.Drawing.Point(4, 188);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4);


            this.grdSum.Name = "grdSum";


            this.grdSum.ReadOnly = true;


            this.grdSum.RowHeadersWidth = 51;


            this.grdSum.RowTemplate.Height = 23;


            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;


            this.grdSum.Size = new System.Drawing.Size(1212, 24);


            this.grdSum.TabIndex = 50;


            // 


            // dateTimePicker2


            // 


@@ -312,22 +349,95 @@


            this.toolStripSeparator9.Name = "toolStripSeparator9";


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);


            // 


            // grdSum


            // txtHGroupName


            // 


            this.grdSum.AllowUserToAddRows = false;


            this.grdSum.AllowUserToDeleteRows = false;


            this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;


            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.grdSum.Location = new System.Drawing.Point(4, 152);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4);


            this.grdSum.Name = "grdSum";


            this.grdSum.ReadOnly = true;


            this.grdSum.RowHeadersWidth = 51;


            this.grdSum.RowTemplate.Height = 23;


            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;


            this.grdSum.Size = new System.Drawing.Size(1212, 24);


            this.grdSum.TabIndex = 50;


            this.txtHGroupName.Location = new System.Drawing.Point(105, 108);


            this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4);


            this.txtHGroupName.Name = "txtHGroupName";


            this.txtHGroupName.Size = new System.Drawing.Size(172, 25);


            this.txtHGroupName.TabIndex = 52;


            // 


            // label5


            // 


            this.label5.AutoSize = true;


            this.label5.Location = new System.Drawing.Point(11, 113);


            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label5.Name = "label5";


            this.label5.Size = new System.Drawing.Size(82, 15);


            this.label5.TabIndex = 51;


            this.label5.Text = "班组名称：";


            // 


            // txtHProcName


            // 


            this.txtHProcName.Location = new System.Drawing.Point(365, 108);


            this.txtHProcName.Margin = new System.Windows.Forms.Padding(4);


            this.txtHProcName.Name = "txtHProcName";


            this.txtHProcName.Size = new System.Drawing.Size(172, 25);


            this.txtHProcName.TabIndex = 54;


            // 


            // label6


            // 


            this.label6.AutoSize = true;


            this.label6.Location = new System.Drawing.Point(285, 113);


            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label6.Name = "label6";


            this.label6.Size = new System.Drawing.Size(82, 15);


            this.label6.TabIndex = 53;


            this.label6.Text = "工序名称：";


            // 


            // txtHFModel


            // 


            this.txtHFModel.Location = new System.Drawing.Point(628, 108);


            this.txtHFModel.Margin = new System.Windows.Forms.Padding(4);


            this.txtHFModel.Name = "txtHFModel";


            this.txtHFModel.Size = new System.Drawing.Size(172, 25);


            this.txtHFModel.TabIndex = 56;


            // 


            // label7


            // 


            this.label7.AutoSize = true;


            this.label7.Location = new System.Drawing.Point(548, 113);


            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label7.Name = "label7";


            this.label7.Size = new System.Drawing.Size(52, 15);


            this.label7.TabIndex = 55;


            this.label7.Text = "花型：";


            // 


            // label10


            // 


            this.label10.AutoSize = true;


            this.label10.Location = new System.Drawing.Point(818, 113);


            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label10.Name = "label10";


            this.label10.Size = new System.Drawing.Size(52, 15);


            this.label10.TabIndex = 57;


            this.label10.Text = "数量：";


            // 


            // txtHBQty


            // 


            this.txtHBQty.Location = new System.Drawing.Point(908, 108);


            this.txtHBQty.Margin = new System.Windows.Forms.Padding(4);


            this.txtHBQty.Name = "txtHBQty";


            this.txtHBQty.Size = new System.Drawing.Size(91, 25);


            this.txtHBQty.TabIndex = 58;


            // 


            // txtHEQty


            // 


            this.txtHEQty.Location = new System.Drawing.Point(1029, 108);


            this.txtHEQty.Margin = new System.Windows.Forms.Padding(4);


            this.txtHEQty.Name = "txtHEQty";


            this.txtHEQty.Size = new System.Drawing.Size(91, 25);


            this.txtHEQty.TabIndex = 59;


            // 


            // label12


            // 


            this.label12.AutoSize = true;


            this.label12.Location = new System.Drawing.Point(1006, 113);


            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label12.Name = "label12";


            this.label12.Size = new System.Drawing.Size(15, 15);


            this.label12.TabIndex = 60;


            this.label12.Text = "-";


            // 


            // Qk_ProcessBillDetail


            // 


@@ -343,9 +453,9 @@


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();


            this.groupBox1.ResumeLayout(false);


            this.groupBox1.PerformLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();


            this.Tool.ResumeLayout(false);


            this.Tool.PerformLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();


            this.ResumeLayout(false);




        }


@@ -376,5 +486,15 @@


        private System.Windows.Forms.ToolStripButton tc;


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;


        private System.Windows.Forms.DataGridView grdSum;


        private System.Windows.Forms.Label label12;


        private System.Windows.Forms.TextBox txtHEQty;


        private System.Windows.Forms.TextBox txtHBQty;


        private System.Windows.Forms.Label label10;


        private System.Windows.Forms.TextBox txtHFModel;


        private System.Windows.Forms.Label label7;


        private System.Windows.Forms.TextBox txtHProcName;


        private System.Windows.Forms.Label label6;


        private System.Windows.Forms.TextBox txtHGroupName;


        private System.Windows.Forms.Label label5;


    }


}




 SCM/±¨±í/Qk_ProcessBillDetail.cs


@@ -45,7 +45,10 @@


                MessageBox.Show("开始时间不能大于截至时间");


                return;


            }


            var execSql = "exec " + ViewName + " '" + dateTimePicker1.Text + "','" + dateTimePicker2.Text + "','" + txtHBillNo.Text + "','" + textBox3.Text + "','" + textBox4.Text + "','" + textBox1.Text + "','" + textBox2.Text + "'";


            var execSql = "exec ç”Ÿäº§å·¥åºæ˜Žç»†è¡¨_New '" + dateTimePicker1.Text + "','" + dateTimePicker2.Text + "','" + 


                txtHBillNo.Text + "','" + textBox3.Text + "','" + textBox4.Text + "','" + textBox1.Text + "','" +


                textBox2.Text + "','" + txtHGroupName.Text + "','" + txtHProcName.Text + "','" + txtHFModel.Text + "'," + 


                DBUtility.ClsPub.isDoule(txtHBQty.Text).ToString() + "," + DBUtility.ClsPub.isDoule(txtHEQty.Text).ToString() + "   " ;


            DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);


            //生成首行标题


            if (DSet == null)