SCM/单据资料/Gy_BarCodeDetailList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/单据资料/Gy_BarCodeMain.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/单据资料/Gy_BarCodeMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/单据资料/Sc_ICMOReportToBarCode.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/单据资料/Sc_ICMOReportToBarCode.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/单据资料/Sc_ICMOReportToBarCode.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/条码打印/Gy_BarCodeBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SCM/生产管理/Gy_BadReasonList.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeDetailList.cs
@@ -65,17 +65,7 @@ if (!string.IsNullOrEmpty(textBox2.Text)) whereBuilder.Append(" and b.FLOT_TEXT like ''%"+textBox2.Text+"%''"); if (comboBox1.Text != "å ¨é¨") { if(comboBox1.Text=="åæ ¼å") { whereBuilder.Append(" and c.HProdLev=''''"); } else { whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text + "''"); } } if (!string.IsNullOrEmpty(textBox4.Text)) whereBuilder.Append(" and g.HName like ''%"+textBox4.Text+"%''"); if (!string.IsNullOrEmpty(textBox5.Text)) SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.Designer.cs
@@ -48,14 +48,12 @@ this.lbldj = new System.Windows.Forms.Label(); this.lblCaption = new System.Windows.Forms.Label(); this.Tool = new System.Windows.Forms.ToolStrip(); this.yl = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.cx = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.tc = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); this.yl = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit(); this.groupBox1.SuspendLayout(); this.pPic.SuspendLayout(); @@ -71,7 +69,7 @@ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill; this.grdMain.Location = new System.Drawing.Point(0, 232); this.grdMain.Margin = new System.Windows.Forms.Padding(4); this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.grdMain.Name = "grdMain"; this.grdMain.ReadOnly = true; this.grdMain.RowHeadersWidth = 51; @@ -82,8 +80,6 @@ // groupBox1 // this.groupBox1.BackColor = System.Drawing.Color.Lavender; this.groupBox1.Controls.Add(this.comboBox1); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.dateTimePicker2); this.groupBox1.Controls.Add(this.dateTimePicker1); this.groupBox1.Controls.Add(this.label9); @@ -96,9 +92,9 @@ this.groupBox1.Controls.Add(this.label4); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox1.Location = new System.Drawing.Point(0, 103); this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Size = new System.Drawing.Size(1277, 129); this.groupBox1.TabIndex = 56; this.groupBox1.TabStop = false; @@ -146,7 +142,7 @@ // textBox2 // this.textBox2.Location = new System.Drawing.Point(628, 75); this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(172, 25); this.textBox2.TabIndex = 16; @@ -164,7 +160,7 @@ // textBox1 // this.textBox1.Location = new System.Drawing.Point(365, 75); this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(172, 25); this.textBox1.TabIndex = 14; @@ -182,7 +178,7 @@ // txtHBillNo // this.txtHBillNo.Location = new System.Drawing.Point(96, 76); this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4); this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtHBillNo.Name = "txtHBillNo"; this.txtHBillNo.Size = new System.Drawing.Size(172, 25); this.txtHBillNo.TabIndex = 12; @@ -206,7 +202,7 @@ this.pPic.Controls.Add(this.lblCaption); this.pPic.Dock = System.Windows.Forms.DockStyle.Top; this.pPic.Location = new System.Drawing.Point(0, 62); this.pPic.Margin = new System.Windows.Forms.Padding(4); this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pPic.Name = "pPic"; this.pPic.Size = new System.Drawing.Size(1277, 41); this.pPic.TabIndex = 55; @@ -217,7 +213,7 @@ this.panel1.Controls.Add(this.lbldj); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; this.panel1.Location = new System.Drawing.Point(1096, 0); this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(181, 41); this.panel1.TabIndex = 7; @@ -276,25 +272,6 @@ this.Tool.TabIndex = 54; this.Tool.Text = "toolStrip1"; // // yl // this.yl.AutoSize = false; this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image"))); this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.yl.ImageTransparentColor = System.Drawing.Color.Magenta; this.yl.Name = "yl"; this.yl.Size = new System.Drawing.Size(35, 42); this.yl.Text = "å¼åº"; this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.yl.Click += new System.EventHandler(this.yl_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62); // // cx // this.cx.AutoSize = false; @@ -334,28 +311,24 @@ this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62); // // comboBox1 // yl // this.comboBox1.FormattingEnabled = true; this.comboBox1.Items.AddRange(new object[] { "å ¨é¨", "å·²æ£éª", "æªæ£éª"}); this.comboBox1.Location = new System.Drawing.Point(907, 75); this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(172, 23); this.comboBox1.TabIndex = 35; this.yl.AutoSize = false; this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image"))); this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.yl.ImageTransparentColor = System.Drawing.Color.Magenta; this.yl.Name = "yl"; this.yl.Size = new System.Drawing.Size(35, 42); this.yl.Text = "å¼åº"; this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.yl.Click += new System.EventHandler(this.yl_Click); // // label8 // toolStripSeparator1 // this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(818, 80); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(82, 15); this.label8.TabIndex = 34; this.label8.Text = "æ£éªç¶åµï¼"; this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62); // // Gy_BarCodeMain // @@ -408,7 +381,5 @@ private System.Windows.Forms.Label label11; private System.Windows.Forms.ToolStripButton yl; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.Label label8; } } SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.cs
@@ -16,7 +16,6 @@ InitializeComponent(); dateTimePicker1.Text = DateTime.Now.AddDays(-7).ToString(); dateTimePicker2.Text = DateTime.Now.ToString(); comboBox1.SelectedItem = "å ¨é¨"; oWeb.Url = SCM.ClsPub1.WEBSURL; } public frmBillQueryCondition_Base frmCondition; @@ -50,10 +49,6 @@ whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''"); if (!string.IsNullOrEmpty(textBox2.Text)) whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''"); if (comboBox1.Text == "å·²æ£éª") whereBuilder.Append(" and c.HMaterName is not null"); else if(comboBox1.Text=="æªæ£éª") whereBuilder.Append(" and c.HMaterName is null"); var execSql = "exec "+ViewName+" '"+whereBuilder+"'"; DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo); //çæé¦è¡æ é¢ SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs
@@ -1,4 +1,4 @@ using System; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -552,12 +552,10 @@ else if (sType == "Sample") { sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text) + "B"; txtHCheckerResult.Text = ""; } else { sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text); txtHCheckerResult.Text = ""; } //sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text); @@ -774,7 +772,6 @@ Report.FieldByName("ç»å").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text); Report.FieldByName("æ°é").AsString = ClsPub.isStrNull(txtHSJQty.Text); Report.FieldByName("æ§ç©æç¼ç ").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text); Report.FieldByName("ä¸è¯åå ").AsString = ClsPub.isStrNull(txtHCheckerResult.Text); //Report.FieldByName("æºååå·").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value); //Report.FieldByName("éå®è®¢åå·").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value); //Report.FieldByName("ç产车é´").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value); @@ -1277,8 +1274,6 @@ { txtHReasonList.Text = ""; txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text; txtHCheckerResult.Text = ""; txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text; if (SaveBadReasonBill()) { MessageBox.Show("ä¿åä¸è¯åå æåï¼"); @@ -1411,8 +1406,6 @@ { txtHReasonList.Text = ""; txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text; txtHCheckerResult.Text = ""; txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text; oGy_BadReasonList = null; if (SaveBill("SaveDown")) { SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.designer.cs
@@ -155,8 +155,6 @@ this.label12 = new System.Windows.Forms.Label(); this.button4 = new System.Windows.Forms.Button(); this.timer3 = new System.Windows.Forms.Timer(this.components); this.txtHCheckerResult = new System.Windows.Forms.TextBox(); this.label33 = new System.Windows.Forms.Label(); this.Tool.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit(); @@ -168,7 +166,6 @@ ((System.ComponentModel.ISupportInitialize)(this.grdEmp)).BeginInit(); this.groupBox4.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); @@ -893,8 +890,6 @@ // tabPage4 // this.tabPage4.BackColor = System.Drawing.Color.Lavender; this.tabPage4.Controls.Add(this.label33); this.tabPage4.Controls.Add(this.txtHCheckerResult); this.tabPage4.Controls.Add(this.label15); this.tabPage4.Controls.Add(this.cmbHOrgID); this.tabPage4.Controls.Add(this.label3); @@ -1667,27 +1662,6 @@ this.timer3.Interval = 300; this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // // txtHCheckerResult // this.txtHCheckerResult.Font = new System.Drawing.Font("å®ä½", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHCheckerResult.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtHCheckerResult.Location = new System.Drawing.Point(795, 96); this.txtHCheckerResult.Name = "txtHCheckerResult"; this.txtHCheckerResult.ReadOnly = true; this.txtHCheckerResult.Size = new System.Drawing.Size(166, 30); this.txtHCheckerResult.TabIndex = 151; // // label33 // this.label33.AutoSize = true; this.label33.Font = new System.Drawing.Font("å®ä½", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label33.ForeColor = System.Drawing.Color.Black; this.label33.Location = new System.Drawing.Point(714, 102); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(72, 16); this.label33.TabIndex = 152; this.label33.Text = "ä¸è¯æ¸ å"; // // Sc_ICMOReportToBarCode // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1724,7 +1698,6 @@ this.panel1.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); @@ -1869,7 +1842,5 @@ private System.Windows.Forms.TextBox txtHEmpID3; private System.Windows.Forms.Button cmdZero; private System.Windows.Forms.Button cmdSaveAndDown2; private System.Windows.Forms.Label label33; private System.Windows.Forms.TextBox txtHCheckerResult; } } SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.resx
@@ -112,15 +112,15 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB @@ -387,10 +387,10 @@ AAAASUVORK5CYII= </value> </data> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>102, 16</value> </metadata> <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>191, 16</value> </metadata> <data name="cmdHEmp3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -718,10 +718,10 @@ FIYcEAA7 </value> </data> <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>292, 16</value> </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>39</value> </metadata> </root> SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -92,7 +92,6 @@ public const Int16 HJiaYeLXCol = 71; public const Int16 HJiaYeLCol = 72; public const Int16 POOrderBillNoCol = 73; public const Int16 HMaker = 74; public Int16 HSelectCol = 0; public Int16 HSno2Col = 1; @@ -1538,7 +1537,7 @@ { grdMain.RowCount = 0; grdSub.RowCount = 0; grdMain.ColumnCount = 75; //æ»åæ° grdMain.ColumnCount = 74; //æ»åæ° ClsPub1.initGridFst(grdMain, this.Name); grdMain.Columns[HSnoCol].HeaderText = "åºå·"; grdMain.Columns[HMainIDCol].HeaderText = "æºå主ID"; @@ -1606,7 +1605,6 @@ grdMain.Columns[HJiaYeLXCol].HeaderText = "å¶å·æ¶²ç±»å"; grdMain.Columns[HJiaYeLCol].HeaderText = "å æ¶²é"; grdMain.Columns[POOrderBillNoCol].HeaderText = "éè´è®¢åå·"; grdMain.Columns[HMaker].HeaderText = "å¶å人"; //// //æ ¼å¼å éèå grdMain.Columns[HTagCol].Visible = false; @@ -2617,7 +2615,6 @@ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["夿³¨"].ToString(); grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["计åè·è¸ªå·"].ToString(); grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); grdMain.Rows[i].Cells[HMaker].Value = ClsPub.CurUserName; if (CampanyName == "å£é¾") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° { SCM/Éú²ú¹ÜÀí/Gy_BadReasonList.resx
@@ -112,9 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root>