diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index e178773..8dfbe05 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -48,7 +48,7 @@ // pictureBox1 // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(295, 25); + this.pictureBox1.Location = new System.Drawing.Point(405, 25); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(80, 80); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -69,7 +69,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(675, 404); + this.panel1.Size = new System.Drawing.Size(888, 415); this.panel1.TabIndex = 0; // // label4 @@ -90,7 +90,7 @@ this.cmbDept.FormattingEnabled = true; this.cmbDept.Location = new System.Drawing.Point(16, 136); this.cmbDept.Name = "cmbDept"; - this.cmbDept.Size = new System.Drawing.Size(645, 41); + this.cmbDept.Size = new System.Drawing.Size(860, 41); this.cmbDept.TabIndex = 9; this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged); // @@ -111,7 +111,7 @@ this.tbID.FormattingEnabled = true; this.tbID.Location = new System.Drawing.Point(16, 213); this.tbID.Name = "tbID"; - this.tbID.Size = new System.Drawing.Size(645, 41); + this.tbID.Size = new System.Drawing.Size(860, 41); this.tbID.TabIndex = 3; // // label2 @@ -142,7 +142,7 @@ this.tbPW.Location = new System.Drawing.Point(16, 287); this.tbPW.Name = "tbPW"; this.tbPW.PasswordChar = '●'; - this.tbPW.Size = new System.Drawing.Size(645, 40); + this.tbPW.Size = new System.Drawing.Size(860, 40); this.tbPW.TabIndex = 5; this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -151,9 +151,9 @@ this.panel2.BackColor = System.Drawing.SystemColors.Control; this.panel2.Controls.Add(this.btLogin); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 404); + this.panel2.Location = new System.Drawing.Point(0, 415); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(675, 105); + this.panel2.Size = new System.Drawing.Size(888, 105); this.panel2.TabIndex = 6; // // btLogin @@ -162,7 +162,7 @@ this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 40F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btLogin.Location = new System.Drawing.Point(0, 0); this.btLogin.Name = "btLogin"; - this.btLogin.Size = new System.Drawing.Size(675, 105); + this.btLogin.Size = new System.Drawing.Size(888, 105); this.btLogin.TabIndex = 0; this.btLogin.Text = "접속"; this.btLogin.UseVisualStyleBackColor = true; @@ -172,7 +172,7 @@ // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.OrangeRed; - this.ClientSize = new System.Drawing.Size(675, 509); + this.ClientSize = new System.Drawing.Size(888, 520); this.Controls.Add(this.panel1); this.Controls.Add(this.panel2); this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/Project/Dialog/fLogin.resx b/Project/Dialog/fLogin.resx index b2520c9..4278117 100644 --- a/Project/Dialog/fLogin.resx +++ b/Project/Dialog/fLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb - rwAAG68BXhqRHAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr + rgAAG64BjF1z+AAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr bxRVFK9+8ItRY/Qf8BE1auIravykRpjdlvcbFCMkxsREfACKxmCqobszW55CUikgL5ECkoLQIkTjB9md 2W6rQmm7te1SmijvtpQ3FMZzZs+F6fYMULZ3d7adX/ILZM+555z768w9985MngcPHoao1fcpochwRTNC PlWvBDYD21PYpGh6BfyroW9+oXEvDR+cKCw071S0yGifGtkGolwEmn0kjDHKgaMwFoUdBDDNO/zByBQQ diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 5aee557..daaee12 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.09.14.0950")] -[assembly: AssemblyFileVersion("23.09.14.0950")] +[assembly: AssemblyVersion("23.09.18.1450")] +[assembly: AssemblyFileVersion("23.09.18.1450")] diff --git a/Project/sample_purchase.xls b/Project/sample_purchase.xls index 3b7ecf9..84b0dd3 100644 Binary files a/Project/sample_purchase.xls and b/Project/sample_purchase.xls differ diff --git a/SubProject/FCM0000/DSInventory.Designer.cs b/SubProject/FCM0000/DSInventory.Designer.cs index 179225c..7e77c93 100644 --- a/SubProject/FCM0000/DSInventory.Designer.cs +++ b/SubProject/FCM0000/DSInventory.Designer.cs @@ -39,6 +39,7 @@ namespace FCM0000 { base.Tables.CollectionChanged += schemaChangedHandler; base.Relations.CollectionChanged += schemaChangedHandler; this.EndInit(); + this.InitExpressions(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -50,6 +51,9 @@ namespace FCM0000 { global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); this.Tables.CollectionChanged += schemaChangedHandler1; this.Relations.CollectionChanged += schemaChangedHandler1; + if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) { + this.InitExpressions(); + } return; } string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string)))); @@ -73,6 +77,7 @@ namespace FCM0000 { } else { this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); + this.InitExpressions(); } this.GetSerializationData(info, context); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); @@ -144,6 +149,7 @@ namespace FCM0000 { public override global::System.Data.DataSet Clone() { DSInventory cln = ((DSInventory)(base.Clone())); cln.InitVars(); + cln.InitExpressions(); cln.SchemaSerializationMode = this.SchemaSerializationMode; return cln; } @@ -230,7 +236,7 @@ namespace FCM0000 { this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; this.tableInventory = new InventoryDataTable(); base.Tables.Add(this.tableInventory); - this.tablevInventory = new vInventoryDataTable(); + this.tablevInventory = new vInventoryDataTable(false); base.Tables.Add(this.tablevInventory); } @@ -301,6 +307,12 @@ namespace FCM0000 { return type; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitExpressions() { + this.vInventory.placeboxColumn.Expression = "place + \'_\' + box"; + } + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void InventoryRowChangeEventHandler(object sender, InventoryRowChangeEvent e); @@ -922,12 +934,23 @@ namespace FCM0000 { private global::System.Data.DataColumn columnbox; + private global::System.Data.DataColumn columnplacebox; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public vInventoryDataTable() { + public vInventoryDataTable() : + this(false) { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public vInventoryDataTable(bool initExpressions) { this.TableName = "vInventory"; this.BeginInit(); this.InitClass(); + if ((initExpressions == true)) { + this.InitExpressions(); + } this.EndInit(); } @@ -1131,6 +1154,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn placeboxColumn { + get { + return this.columnplacebox; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1166,6 +1197,61 @@ namespace FCM0000 { this.Rows.Add(row); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public vInventoryRow AddvInventoryRow( + string gcode, + string pdate, + string invtype, + string uid, + string userName, + int item, + string serial, + int dr_qty, + decimal dr_amt, + int cr_qty, + decimal cr_amt, + string place, + string memo, + string itemName, + string itemModel, + int project, + string projectName, + string wuid, + System.DateTime wdate, + string sid, + string box, + string placebox) { + vInventoryRow rowvInventoryRow = ((vInventoryRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + gcode, + pdate, + invtype, + uid, + userName, + item, + serial, + dr_qty, + dr_amt, + cr_qty, + cr_amt, + place, + memo, + itemName, + itemModel, + project, + projectName, + wuid, + wdate, + sid, + box, + placebox}; + rowvInventoryRow.ItemArray = columnValuesArray; + this.Rows.Add(rowvInventoryRow); + return rowvInventoryRow; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public vInventoryRow AddvInventoryRow( @@ -1213,7 +1299,8 @@ namespace FCM0000 { wuid, wdate, sid, - box}; + box, + null}; rowvInventoryRow.ItemArray = columnValuesArray; this.Rows.Add(rowvInventoryRow); return rowvInventoryRow; @@ -1265,6 +1352,7 @@ namespace FCM0000 { this.columnwdate = base.Columns["wdate"]; this.columnsid = base.Columns["sid"]; this.columnbox = base.Columns["box"]; + this.columnplacebox = base.Columns["placebox"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1314,6 +1402,8 @@ namespace FCM0000 { base.Columns.Add(this.columnsid); this.columnbox = new global::System.Data.DataColumn("box", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbox); + this.columnplacebox = new global::System.Data.DataColumn("placebox", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnplacebox); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1338,6 +1428,7 @@ namespace FCM0000 { this.columnwdate.AllowDBNull = false; this.columnsid.MaxLength = 50; this.columnbox.MaxLength = 100; + this.columnplacebox.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1358,6 +1449,12 @@ namespace FCM0000 { return typeof(vInventoryRow); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitExpressions() { + this.placeboxColumn.Expression = "place + \'_\' + box"; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { @@ -2317,6 +2414,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string placebox { + get { + if (this.IsplaceboxNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevInventory.placeboxColumn])); + } + } + set { + this[this.tablevInventory.placeboxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -2532,6 +2645,18 @@ namespace FCM0000 { public void SetboxNull() { this[this.tablevInventory.boxColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsplaceboxNull() { + return this.IsNull(this.tablevInventory.placeboxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetplaceboxNull() { + this[this.tablevInventory.placeboxColumn] = global::System.Convert.DBNull; + } } /// @@ -4143,7 +4268,7 @@ ORDER BY pdate DESC"; else { this.Adapter.SelectCommand.Parameters[5].Value = ((string)(place)); } - DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable(); + DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } diff --git a/SubProject/FCM0000/DSInventory.xsd b/SubProject/FCM0000/DSInventory.xsd index bd95446..057d86a 100644 --- a/SubProject/FCM0000/DSInventory.xsd +++ b/SubProject/FCM0000/DSInventory.xsd @@ -558,6 +558,7 @@ and item = @item + diff --git a/SubProject/FCM0000/Inventory/fInventory.Designer.cs b/SubProject/FCM0000/Inventory/fInventory.Designer.cs index dd2457c..7abf2bb 100644 --- a/SubProject/FCM0000/Inventory/fInventory.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventory.Designer.cs @@ -75,9 +75,6 @@ this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.보관소별재고확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSInventory = new FCM0000.DSInventory(); - this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter(); this.arDatagridView1 = new arCtl.arDatagridView(); this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.invtypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -91,13 +88,16 @@ this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.boxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSInventory = new FCM0000.DSInventory(); + this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.cm.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSInventory)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.SuspendLayout(); // // bn @@ -258,7 +258,7 @@ this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.Size = new System.Drawing.Size(150, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown); // // toolStripButton1 @@ -487,20 +487,6 @@ this.보관소별재고확인ToolStripMenuItem.Text = "보관소별 재고 확인"; this.보관소별재고확인ToolStripMenuItem.Click += new System.EventHandler(this.보관소별재고확인ToolStripMenuItem_Click); // - // bs - // - this.bs.DataMember = "vInventory"; - this.bs.DataSource = this.dSInventory; - // - // dSInventory - // - this.dSInventory.DataSetName = "DSInventory"; - this.dSInventory.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // ta - // - this.ta.ClearBeforeFill = true; - // // arDatagridView1 // this.arDatagridView1.A_DelCurrentCell = true; @@ -628,6 +614,20 @@ this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; this.memoDataGridViewTextBoxColumn.ReadOnly = true; // + // bs + // + this.bs.DataMember = "vInventory"; + this.bs.DataSource = this.dSInventory; + // + // dSInventory + // + this.dSInventory.DataSetName = "DSInventory"; + this.dSInventory.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // // fInventory // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -645,9 +645,9 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.cm.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dSInventory)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FCM0000/Inventory/fInventory.cs b/SubProject/FCM0000/Inventory/fInventory.cs index c058184..3f2a592 100644 --- a/SubProject/FCM0000/Inventory/fInventory.cs +++ b/SubProject/FCM0000/Inventory/fInventory.cs @@ -374,7 +374,7 @@ namespace FCM0000 } else { - var collist = new string[] { "username","box","uid","place","itemName","itemModel","serial","memo" }; + var collist = new string[] { "username","box","uid","place","itemName","itemModel","serial","placebox","memo" }; search = search.Replace("'", "''"); string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?"; foreach(var col in collist) @@ -441,6 +441,7 @@ namespace FCM0000 newdr.itemModel = dr.itemModel; newdr.itemName = dr.itemName; newdr.place = dr.place; + newdr.box = dr.box; newdr.sid = dr.sid; @@ -478,6 +479,7 @@ namespace FCM0000 newdr.itemModel = dr.itemModel; newdr.itemName = dr.itemName; newdr.place = dr.place; + newdr.box = dr.box; var f = new finventoryAdd(newdr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) diff --git a/SubProject/FCM0000/Inventory/fInventory.resx b/SubProject/FCM0000/Inventory/fInventory.resx index 2140e3c..834347e 100644 --- a/SubProject/FCM0000/Inventory/fInventory.resx +++ b/SubProject/FCM0000/Inventory/fInventory.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -164,7 +164,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -187,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs index 668ea39..842c42b 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs @@ -70,7 +70,6 @@ this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.amtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.placeboxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -191,7 +190,7 @@ this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.Size = new System.Drawing.Size(200, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown); // // toolStripButton1 @@ -293,7 +292,7 @@ this.toolStripMenuItem2, this.exportListToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(241, 140); + this.cm.Size = new System.Drawing.Size(241, 118); // // 입고등록ToolStripMenuItem // @@ -353,8 +352,7 @@ this.modelDataGridViewTextBoxColumn, this.sidDataGridViewTextBoxColumn, this.qtyDataGridViewTextBoxColumn, - this.amtDataGridViewTextBoxColumn, - this.placeboxDataGridViewTextBoxColumn}); + this.amtDataGridViewTextBoxColumn}); this.arDatagridView1.ContextMenuStrip = this.cm; this.arDatagridView1.DataSource = this.bs; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -431,13 +429,6 @@ this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn"; this.amtDataGridViewTextBoxColumn.ReadOnly = true; // - // placeboxDataGridViewTextBoxColumn - // - this.placeboxDataGridViewTextBoxColumn.DataPropertyName = "placebox"; - this.placeboxDataGridViewTextBoxColumn.HeaderText = "placebox"; - this.placeboxDataGridViewTextBoxColumn.Name = "placeboxDataGridViewTextBoxColumn"; - this.placeboxDataGridViewTextBoxColumn.ReadOnly = true; - // // fInventoryJagoList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -504,6 +495,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn amtDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn placeboxDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs index ef30f90..0454bf3 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs @@ -224,6 +224,7 @@ namespace FCM0000 newdr.itemModel = dr.model; newdr.itemName = dr.name; newdr.place = dr.place; + newdr.box = dr.box; newdr.sid = dr.sid; newdr.gcode = FCOMMON.info.Login.gcode; @@ -269,6 +270,7 @@ namespace FCM0000 newdr.itemName = dr.name; newdr.place = dr.place; newdr.sid = dr.sid; + newdr.box = dr.box; newdr.gcode = FCOMMON.info.Login.gcode; newdr.wuid = FCOMMON.info.Login.no; diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx index 109fb1a..034bd3e 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index a444667..4020b5f 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -63,6 +63,7 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -130,6 +131,10 @@ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.tbManager = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.tbAdmin = new System.Windows.Forms.ToolStripTextBox(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.btSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); @@ -217,7 +222,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1284, 26); + this.bn.Size = new System.Drawing.Size(1334, 26); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -255,6 +260,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -372,6 +378,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -619,6 +626,10 @@ this.toolStripSeparator3, this.toolStripLabel3, this.tbRequest, + this.toolStripLabel6, + this.tbManager, + this.toolStripLabel7, + this.tbAdmin, this.toolStripSeparator4, this.btSearch, this.toolStripSeparator5, @@ -628,7 +639,7 @@ this.toolStripButton3}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1284, 37); + this.toolStrip1.Size = new System.Drawing.Size(1334, 37); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -645,8 +656,9 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; - this.dtSD.Size = new System.Drawing.Size(90, 37); + this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dtSD.DoubleClick += new System.EventHandler(this.dtSD_DoubleClick); @@ -661,8 +673,9 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; - this.dtED.Size = new System.Drawing.Size(90, 37); + this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dtED.DoubleClick += new System.EventHandler(this.dtSD_DoubleClick); @@ -716,11 +729,40 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(55, 34); + this.toolStripLabel6.Text = "구매담당"; + // + // tbManager + // + this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbManager.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbManager.Name = "tbManager"; + this.tbManager.Size = new System.Drawing.Size(70, 37); + this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(55, 34); + this.toolStripLabel7.Text = "구매승인"; + // + // tbAdmin + // + this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbAdmin.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbAdmin.Name = "tbAdmin"; + this.tbAdmin.Size = new System.Drawing.Size(70, 37); + this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; @@ -814,11 +856,11 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1284, 584); + this.fpSpread1.Size = new System.Drawing.Size(1334, 584); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); - this.fpSpread1.SetViewportLeftColumn(0, 0, 5); + this.fpSpread1.SetViewportLeftColumn(0, 0, 2); // // label1 // @@ -827,7 +869,7 @@ this.label1.Location = new System.Drawing.Point(0, 644); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1284, 23); + this.label1.Size = new System.Drawing.Size(1334, 23); this.label1.TabIndex = 6; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -839,7 +881,7 @@ this.label2.Location = new System.Drawing.Point(0, 621); this.label2.Name = "label2"; this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label2.Size = new System.Drawing.Size(1284, 23); + this.label2.Size = new System.Drawing.Size(1334, 23); this.label2.TabIndex = 7; this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -850,7 +892,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 36; + this.fpSpread1_Sheet1.ColumnCount = 38; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -889,7 +931,9 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "입고수량"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "PO#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "비고\r\n(담당자)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "구매담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "구매승인"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1"; @@ -1145,11 +1189,21 @@ this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(34).Label = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType3; - this.fpSpread1_Sheet1.Columns.Get(35).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(35).Label = "삭제됨"; - this.fpSpread1_Sheet1.Columns.Get(35).Tag = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(35).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(35).DataField = "purchase_manager"; + this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(35).Label = "구매담당"; + this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_admin"; + this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매승인"; + this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(37).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(37).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(37).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(37).Width = 51F; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1160,7 +1214,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1284, 693); + this.ClientSize = new System.Drawing.Size(1334, 693); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.label2); this.Controls.Add(this.label1); @@ -1266,6 +1320,10 @@ private System.Windows.Forms.ToolStripMenuItem 입고ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.Label label2; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripTextBox tbManager; + private System.Windows.Forms.ToolStripTextBox tbAdmin; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 04e1e52..5b6edb0 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs @@ -12,6 +12,7 @@ using NetOffice; using Outlook = NetOffice.OutlookApi; using NetOffice.OutlookApi.Enums; using FEQ0000.Purchase; +using FCOMMON; namespace FEQ0000 { @@ -197,6 +198,14 @@ namespace FEQ0000 cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)"; } + if (tbManager.Text.isEmpty() == false) + { + cmd.CommandText += $" and purchase_manager like '%{tbManager.Text.Replace("'", "''")}%'"; + } + if (tbAdmin.Text.isEmpty() == false) + { + cmd.CommandText += $" and purchase_admin like '%{tbAdmin.Text.Replace("'", "''")}%'"; + } if (cmbState.SelectedIndex != 0) { @@ -440,7 +449,12 @@ namespace FEQ0000 else newdr.request = FCOMMON.info.Login.no; - repeat: + var t1 = DBM.getCodeByCode("65", "01"); + var t2 = DBM.getCodeByCode("66", "01"); + newdr.purchase_manager = t1.title; + newdr.purchase_admin = t2.title; + + repeat: bool repeat = false; DialogResult dlg; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx index e8bb864..af2b5c2 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -147,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -176,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -211,7 +211,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index 08c4ae9..41ff7b0 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -56,6 +56,8 @@ System.Windows.Forms.Label label13; System.Windows.Forms.Label label14; System.Windows.Forms.Label label15; + System.Windows.Forms.Label label16; + System.Windows.Forms.Label label17; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -82,6 +84,8 @@ this.chkExp = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.tbQtyReal = new System.Windows.Forms.TextBox(); + this.tbBigoChk = new System.Windows.Forms.TextBox(); this.chk2 = new System.Windows.Forms.CheckBox(); this.chk1 = new System.Windows.Forms.CheckBox(); this.btSIDChk = new System.Windows.Forms.Button(); @@ -109,8 +113,8 @@ this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.tbBigoChk = new System.Windows.Forms.TextBox(); - this.tbQtyReal = new System.Windows.Forms.TextBox(); + this.tbAdmin = new System.Windows.Forms.TextBox(); + this.tbManager = new System.Windows.Forms.TextBox(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -137,6 +141,8 @@ label13 = new System.Windows.Forms.Label(); label14 = new System.Windows.Forms.Label(); label15 = new System.Windows.Forms.Label(); + label16 = new System.Windows.Forms.Label(); + label17 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -320,7 +326,7 @@ // label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; label7.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label7.Location = new System.Drawing.Point(11, 596); + label7.Location = new System.Drawing.Point(11, 661); label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; label7.Padding = new System.Windows.Forms.Padding(5); @@ -391,6 +397,27 @@ label13.TabIndex = 22; label13.Text = "Cost Center"; // + // label14 + // + label14.AutoSize = true; + label14.Location = new System.Drawing.Point(4, 461); + label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label14.Name = "label14"; + label14.Size = new System.Drawing.Size(84, 20); + label14.TabIndex = 36; + label14.Text = "담당자비고"; + this.toolTip1.SetToolTip(label14, resources.GetString("label14.ToolTip")); + // + // label15 + // + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(237, 144); + label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(94, 20); + label15.TabIndex = 14; + label15.Text = "실 구매 수량"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 191); @@ -551,7 +578,7 @@ // // btSave // - this.btSave.Location = new System.Drawing.Point(11, 705); + this.btSave.Location = new System.Drawing.Point(11, 770); this.btSave.Margin = new System.Windows.Forms.Padding(4); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(490, 43); @@ -655,7 +682,7 @@ // // btSaveAdd // - this.btSaveAdd.Location = new System.Drawing.Point(511, 705); + this.btSaveAdd.Location = new System.Drawing.Point(511, 770); this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4); this.btSaveAdd.Name = "btSaveAdd"; this.btSaveAdd.Size = new System.Drawing.Size(410, 43); @@ -710,12 +737,35 @@ 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(490, 582); + this.groupBox1.Size = new System.Drawing.Size(490, 651); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); // + // tbQtyReal + // + this.tbQtyReal.Location = new System.Drawing.Point(339, 140); + this.tbQtyReal.Margin = new System.Windows.Forms.Padding(4); + this.tbQtyReal.Name = "tbQtyReal"; + this.tbQtyReal.Size = new System.Drawing.Size(135, 27); + this.tbQtyReal.TabIndex = 15; + this.tbQtyReal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReal.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); + // + // tbBigoChk + // + this.tbBigoChk.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbBigoChk.Location = new System.Drawing.Point(93, 457); + this.tbBigoChk.Margin = new System.Windows.Forms.Padding(4); + this.tbBigoChk.MaxLength = 500; + this.tbBigoChk.Multiline = true; + this.tbBigoChk.Name = "tbBigoChk"; + this.tbBigoChk.Size = new System.Drawing.Size(381, 91); + this.tbBigoChk.TabIndex = 37; + this.tbBigoChk.TabStop = false; + this.toolTip1.SetToolTip(this.tbBigoChk, resources.GetString("tbBigoChk.ToolTip")); + // // chk2 // this.chk2.AutoSize = true; @@ -803,6 +853,10 @@ // groupBox2 // this.groupBox2.BackColor = System.Drawing.Color.Gainsboro; + this.groupBox2.Controls.Add(this.tbAdmin); + this.groupBox2.Controls.Add(label16); + this.groupBox2.Controls.Add(this.tbManager); + this.groupBox2.Controls.Add(label17); this.groupBox2.Controls.Add(this.btEQModel); this.groupBox2.Controls.Add(this.btEQManu); this.groupBox2.Controls.Add(this.btManuProc); @@ -838,7 +892,7 @@ this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(409, 581); + this.groupBox2.Size = new System.Drawing.Size(409, 650); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; @@ -915,7 +969,7 @@ // // button7 // - this.button7.Location = new System.Drawing.Point(4, 547); + this.button7.Location = new System.Drawing.Point(4, 615); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(93, 27); this.button7.TabIndex = 29; @@ -925,7 +979,7 @@ // // button6 // - this.button6.Location = new System.Drawing.Point(4, 515); + this.button6.Location = new System.Drawing.Point(4, 583); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(93, 27); this.button6.TabIndex = 28; @@ -935,7 +989,7 @@ // // button5 // - this.button5.Location = new System.Drawing.Point(4, 483); + this.button5.Location = new System.Drawing.Point(4, 551); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(93, 27); this.button5.TabIndex = 27; @@ -945,7 +999,7 @@ // // button4 // - this.button4.Location = new System.Drawing.Point(4, 451); + this.button4.Location = new System.Drawing.Point(4, 519); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(93, 27); this.button4.TabIndex = 26; @@ -965,7 +1019,7 @@ // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.Gray; - this.pictureBox1.Location = new System.Drawing.Point(104, 451); + this.pictureBox1.Location = new System.Drawing.Point(104, 519); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(286, 123); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -992,55 +1046,47 @@ this.timer1.Interval = 250; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // tbBigoChk + // tbAdmin // - this.tbBigoChk.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbBigoChk.Location = new System.Drawing.Point(93, 457); - this.tbBigoChk.Margin = new System.Windows.Forms.Padding(4); - this.tbBigoChk.MaxLength = 500; - this.tbBigoChk.Multiline = true; - this.tbBigoChk.Name = "tbBigoChk"; - this.tbBigoChk.Size = new System.Drawing.Size(381, 91); - this.tbBigoChk.TabIndex = 37; - this.tbBigoChk.TabStop = false; - this.toolTip1.SetToolTip(this.tbBigoChk, resources.GetString("tbBigoChk.ToolTip")); + this.tbAdmin.Location = new System.Drawing.Point(104, 479); + this.tbAdmin.Margin = new System.Windows.Forms.Padding(4); + this.tbAdmin.Name = "tbAdmin"; + this.tbAdmin.Size = new System.Drawing.Size(286, 27); + this.tbAdmin.TabIndex = 45; // - // label14 + // label16 // - label14.AutoSize = true; - label14.Location = new System.Drawing.Point(4, 461); - label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label14.Name = "label14"; - label14.Size = new System.Drawing.Size(84, 20); - label14.TabIndex = 36; - label14.Text = "담당자비고"; - this.toolTip1.SetToolTip(label14, resources.GetString("label14.ToolTip")); + label16.AutoSize = true; + label16.Location = new System.Drawing.Point(2, 482); + label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label16.Name = "label16"; + label16.Size = new System.Drawing.Size(99, 20); + label16.TabIndex = 44; + label16.Text = "구매승인자명"; // - // tbQtyReal + // tbManager // - this.tbQtyReal.Location = new System.Drawing.Point(339, 140); - this.tbQtyReal.Margin = new System.Windows.Forms.Padding(4); - this.tbQtyReal.Name = "tbQtyReal"; - this.tbQtyReal.Size = new System.Drawing.Size(135, 27); - this.tbQtyReal.TabIndex = 15; - this.tbQtyReal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbQtyReal.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); + this.tbManager.Location = new System.Drawing.Point(104, 450); + this.tbManager.Margin = new System.Windows.Forms.Padding(4); + this.tbManager.Name = "tbManager"; + this.tbManager.Size = new System.Drawing.Size(286, 27); + this.tbManager.TabIndex = 43; // - // label15 + // label17 // - label15.AutoSize = true; - label15.Location = new System.Drawing.Point(237, 144); - label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label15.Name = "label15"; - label15.Size = new System.Drawing.Size(94, 20); - label15.TabIndex = 14; - label15.Text = "실 구매 수량"; + label17.AutoSize = true; + label17.Location = new System.Drawing.Point(2, 454); + label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label17.Name = "label17"; + label17.Size = new System.Drawing.Size(99, 20); + label17.TabIndex = 42; + label17.Text = "구매담당자명"; // // fPurchase_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(928, 761); + this.ClientSize = new System.Drawing.Size(928, 821); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btSaveAdd); @@ -1123,5 +1169,7 @@ private System.Windows.Forms.Button btEQModel; private System.Windows.Forms.TextBox tbBigoChk; private System.Windows.Forms.TextBox tbQtyReal; + private System.Windows.Forms.TextBox tbAdmin; + private System.Windows.Forms.TextBox tbManager; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 82feff2..02ce566 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -97,7 +97,6 @@ namespace FEQ0000 } ///입력된 데이터를 적용한다. - dtPdate.Value = DateTime.Parse(dr.pdate); if (cmbRequest.Items.Count > 0) { for (int i = 0; i < cmbRequest.Items.Count; i++) @@ -199,6 +198,9 @@ namespace FEQ0000 chk1.Checked = dr.chk1; chk2.Checked = dr.chk2; + tbManager.Text = dr.purchase_manager; + tbAdmin.Text = dr.purchase_admin; + tbSC.Text = dr.sc; tbPO.Text = dr.po; tbOrderNo.Text = dr.orderno; @@ -665,15 +667,15 @@ namespace FEQ0000 } - if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Added) - { - if (dr.sc != tbSC.Text.Trim() && tbSC.Text != "") - { - dtPdate.Value = DateTime.Now; - this.cmbState.SelectedValue = "Approving"; - //if (dr.state == "00") dr.state = "01"; //approv 변경 - } - } + //if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Added) + //{ + // if (dr.sc != tbSC.Text.Trim() && tbSC.Text != "") + // { + // //dtPdate.Value = DateTime.Now; + // this.cmbState.SelectedValue = "Approving"; + // //if (dr.state == "00") dr.state = "01"; //approv 변경 + // } + //} //품목정보에 없는 데이터이므로 자료를 추가한다. if (tbPumIDX.Text == "-1") @@ -774,6 +776,9 @@ namespace FEQ0000 dr.costcenter = tbCostCenter.Text; dr.linecode = tbLineCode.Text; + dr.purchase_manager= tbManager.Text; + dr.purchase_admin = tbAdmin.Text; + if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull(); else dr.supplyidx = int.Parse(tbSupplyIndex.Text); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index f2fb274..c5d000e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -208,23 +208,6 @@ False - - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) -* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) -* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) -* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) -* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - - - False - - - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) -* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) -* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) -* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) -* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - False @@ -235,6 +218,29 @@ * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + False + + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) +* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) +* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) +* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) +* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) +* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) +* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) +* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) +* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + + False + + + False + 17, 17 diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs index 7aadd2d..e65e171 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs @@ -65,6 +65,10 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.sbSum = new System.Windows.Forms.ToolStripLabel(); this.panel2 = new System.Windows.Forms.Panel(); + this.nudAdm = new System.Windows.Forms.NumericUpDown(); + this.label24 = new System.Windows.Forms.Label(); + this.nudMan = new System.Windows.Forms.NumericUpDown(); + this.label27 = new System.Windows.Forms.Label(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); this.nudLine = new System.Windows.Forms.NumericUpDown(); this.label12 = new System.Windows.Forms.Label(); @@ -113,8 +117,6 @@ this.listView1 = new System.Windows.Forms.ListView(); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader14 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -123,8 +125,10 @@ this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader11 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader12 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader13 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader12 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader16 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader15 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader17 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -135,6 +139,8 @@ this.선택반전ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bsCR = new System.Windows.Forms.BindingSource(this.components); this.taCR = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); + this.columnHeader19 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader20 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); stateLabel = new System.Windows.Forms.Label(); label15 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bsNR)).BeginInit(); @@ -146,6 +152,8 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAdm)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMan)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudLine)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCost)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudPdate)).BeginInit(); @@ -177,6 +185,15 @@ stateLabel.TabIndex = 53; stateLabel.Text = "구매상태"; // + // label15 + // + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(276, 56); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(53, 12); + label15.TabIndex = 69; + label15.Text = "프로젝트"; + // // processLabel // this.processLabel.AutoSize = true; @@ -213,15 +230,6 @@ this.assetLabel.TabIndex = 61; this.assetLabel.Text = "장비모델"; // - // label15 - // - label15.AutoSize = true; - label15.Location = new System.Drawing.Point(276, 56); - label15.Name = "label15"; - label15.Size = new System.Drawing.Size(53, 12); - label15.TabIndex = 69; - label15.Text = "프로젝트"; - // // textBox1 // this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -533,6 +541,10 @@ // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.nudAdm); + this.panel2.Controls.Add(this.label24); + this.panel2.Controls.Add(this.nudMan); + this.panel2.Controls.Add(this.label27); this.panel2.Controls.Add(this.linkLabel3); this.panel2.Controls.Add(this.linkLabel2); this.panel2.Controls.Add(this.nudLine); @@ -574,10 +586,44 @@ this.panel2.ForeColor = System.Drawing.Color.White; this.panel2.Location = new System.Drawing.Point(0, 57); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1184, 88); + this.panel2.Size = new System.Drawing.Size(1184, 112); this.panel2.TabIndex = 3; this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); // + // nudAdm + // + this.nudAdm.Location = new System.Drawing.Point(161, 84); + this.nudAdm.Name = "nudAdm"; + this.nudAdm.Size = new System.Drawing.Size(45, 21); + this.nudAdm.TabIndex = 76; + this.nudAdm.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(105, 88); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(53, 12); + this.label24.TabIndex = 75; + this.label24.Text = "구매승인"; + // + // nudMan + // + this.nudMan.Location = new System.Drawing.Point(59, 84); + this.nudMan.Name = "nudMan"; + this.nudMan.Size = new System.Drawing.Size(45, 21); + this.nudMan.TabIndex = 74; + this.nudMan.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(2, 88); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(53, 12); + this.label27.TabIndex = 73; + this.label27.Text = "구매담당"; + // // linkLabel3 // this.linkLabel3.AutoSize = true; @@ -676,7 +722,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(112, 37); + this.label17.Location = new System.Drawing.Point(119, 37); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(41, 12); this.label17.TabIndex = 58; @@ -712,7 +758,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(129, 62); + this.label9.Location = new System.Drawing.Point(136, 62); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(22, 12); this.label9.TabIndex = 52; @@ -937,7 +983,7 @@ this.panel3.Controls.Add(this.label34); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; this.panel3.ForeColor = System.Drawing.Color.White; - this.panel3.Location = new System.Drawing.Point(0, 145); + this.panel3.Location = new System.Drawing.Point(0, 169); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(1184, 82); this.panel3.TabIndex = 4; @@ -1042,15 +1088,17 @@ this.columnHeader16, this.columnHeader15, this.columnHeader17, - this.columnHeader18}); + this.columnHeader18, + this.columnHeader19, + this.columnHeader20}); this.listView1.ContextMenuStrip = this.contextMenuStrip1; this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; this.listView1.FullRowSelect = true; this.listView1.GridLines = true; this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(0, 227); + this.listView1.Location = new System.Drawing.Point(0, 251); this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(1184, 406); + this.listView1.Size = new System.Drawing.Size(1184, 382); this.listView1.TabIndex = 5; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -1063,16 +1111,6 @@ // this.columnHeader14.Text = "청구인"; // - // columnHeader1 - // - this.columnHeader1.Text = "SC"; - this.columnHeader1.Width = 57; - // - // columnHeader2 - // - this.columnHeader2.Text = "CR/CF"; - this.columnHeader2.Width = 58; - // // columnHeader4 // this.columnHeader4.Text = "SID"; @@ -1109,15 +1147,25 @@ this.columnHeader11.Text = "공급처"; this.columnHeader11.Width = 64; // + // columnHeader13 + // + this.columnHeader13.Text = "비고"; + this.columnHeader13.Width = 68; + // // columnHeader12 // this.columnHeader12.Text = "PO"; this.columnHeader12.Width = 58; // - // columnHeader13 + // columnHeader1 // - this.columnHeader13.Text = "비고"; - this.columnHeader13.Width = 68; + this.columnHeader1.Text = "SC"; + this.columnHeader1.Width = 57; + // + // columnHeader2 + // + this.columnHeader2.Text = "CR/CF"; + this.columnHeader2.Width = 58; // // columnHeader16 // @@ -1130,10 +1178,12 @@ // columnHeader17 // this.columnHeader17.Text = "CostCenter"; + this.columnHeader17.Width = 76; // // columnHeader18 // this.columnHeader18.Text = "LineCode"; + this.columnHeader18.Width = 72; // // contextMenuStrip1 // @@ -1174,6 +1224,16 @@ // this.taCR.ClearBeforeFill = true; // + // columnHeader19 + // + this.columnHeader19.Text = "구매담당"; + this.columnHeader19.Width = 72; + // + // columnHeader20 + // + this.columnHeader20.Text = "구매승인"; + this.columnHeader20.Width = 72; + // // fPurchase_excelimport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1200,6 +1260,8 @@ this.bn.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAdm)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMan)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudLine)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCost)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudPdate)).EndInit(); @@ -1331,5 +1393,11 @@ protected System.Windows.Forms.Label label22; protected System.Windows.Forms.Label label23; protected System.Windows.Forms.Label assetLabel; + private System.Windows.Forms.NumericUpDown nudAdm; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.NumericUpDown nudMan; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.ColumnHeader columnHeader19; + private System.Windows.Forms.ColumnHeader columnHeader20; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs index 675aeb7..810f31f 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs @@ -431,6 +431,8 @@ namespace FEQ0000 string 수령인 = string.Empty; string CostCode = string.Empty; string LIneCode = string.Empty; + string 구매담당 = string.Empty; + string 구매승인 = string.Empty; var cf_qty = sheet.cellType(r, (int)nudQty.Value - 1); var cf_price = sheet.cellType(r, (int)nudPrice.Value - 1); @@ -548,6 +550,9 @@ namespace FEQ0000 if (nudCost.Value > 0) CostCode = sheet.readStr(r, (int)nudCost.Value - 1).Trim(); if (nudLine.Value > 0) LIneCode = sheet.readStr(r, (int)nudLine.Value - 1).Trim(); + if (nudMan.Value > 0) 구매담당 = sheet.readStr(r, (int)nudMan.Value - 1).Trim(); + if (nudAdm.Value > 0) 구매승인 = sheet.readStr(r, (int)nudAdm.Value - 1).Trim(); + //sid 공백과 - _ 제거 200506 SID = SID.Replace(" ", "").Replace("-", "").Replace("_", "").Trim(); @@ -598,14 +603,14 @@ namespace FEQ0000 newitem.SubItems.Add(SC); newitem.SubItems.Add(CRCF); - - - newitem.SubItems.Add(입고일); newitem.SubItems.Add(수령인); newitem.SubItems.Add(CostCode); newitem.SubItems.Add(LIneCode); + newitem.SubItems.Add(구매담당); + newitem.SubItems.Add(구매승인); + //데이터도 추가를 해준다 if (crmode) { @@ -632,6 +637,8 @@ namespace FEQ0000 newdr.import = true; newdr.costcenter = CostCode; newdr.linecode = LIneCode; + newdr.purchase_manager = 구매담당; + newdr.purchase_admin = 구매승인; newitem.Tag = newdr; this.dsPRJ.EETGW_PurchaseCR.AddEETGW_PurchaseCRRow(newdr); } @@ -660,13 +667,11 @@ namespace FEQ0000 newdr.import = true; newdr.costcenter = CostCode; newdr.linecode = LIneCode; + newdr.purchase_manager = 구매담당; + newdr.purchase_admin = 구매승인; newitem.Tag = newdr; this.dsPRJ.Purchase.AddPurchaseRow(newdr); } - - - - sumamt += d_amt; } @@ -772,6 +777,8 @@ namespace FEQ0000 nudRecv.Value = idx++; nudCost.Value = idx++; nudLine.Value = idx++; + nudMan.Value = idx++; + nudAdm.Value = idx++; } private void label25_Click(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx index 4ae5bf8..ef701d8 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx @@ -129,9 +129,6 @@ 209, 17 - - 209, 17 - 17, 17 @@ -139,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -150,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -159,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -168,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -179,35 +176,35 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKOSURBVDhPzZHdT1JxGMdPW1t32Xq5aK4/oP/BrZtuuvSq - tbXZRXO2aTO7cEuNrHRrLY2lhiDJMSGSbIKICCJYCCIt5VVF4uUczjkcwAM20hiNb3Citf4Dv9tvz8Xz - +fyeZ3uI45VkMtmUim0vMEHbIbO1DParGazXCNajB7eu+8mF3E6GYZrq+P+hKIpkI85SOmCBEFoBv2nC - 7ooaIfMkotZJHKzPQPj8FknzeIWP+g117U9oml5iAw7kAlZsLZGYVw1DRyqg0c6DVBuhIA3QKBVwKPuR - s4xAMEuR9dv8opxIJIbY8BpyvkXYda+xthHGe2ce0448lFYBo6Z9DOmzGNDx0Lvz2LVMI/XhCQr6QVB+ - t4qgdwJpxjuL8IYN5XIZBs8Bpux5KCwCzly4hIbzjXg6k0GvOl2tvMhwficYTQ988rtlIryqraSpKI6O - jsSmzlmAzJyD1JhDw7lGnD57EQ+mOdxXMuir1hpTY3NRP74Mt4HY2w7+EgQBxWIRpVIJK75CdWUegzoO - DzUMulUpdCpotI0l8caaFZkaW3OC2ucVgt6wCnxiG4VCQWxEU98hX+TQQ1LVqUm0y+K4/SqG3ikKm3t5 - kamxXMiLuKyzRMQjofH0+iwy1Svsswnk83n4IjzIpSS6JyK4J9vF6FwcnmBaFAWeBe9ZADXWCpdc4hIv - sbPpdtHLE8g5lEhXN8ru+dgMRyWy2Wzs78tkMjHG52K5eSmSVdnyrIsFQZwQP6jFu2rWr6lGyt9mBsAb - X4C3KsA51GDtanA2ErT+JWh5OyySWxXj2OMNu+TKybr6LyZpxynDYOt1naRFO/eohTf13/hhltw8/NjX - XJztav6k7rjW9e7O1ct1/FiEIH4DO4IXxHMqXrIAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKNSURBVDhPzZHdT1JxGMdPW1t32Xq5aK4/oP/BrZtuuvSq + tbXZRXO2aSu7cEuLrHTzIo2laCDpMSGV2AQREVTIEARaypsKEi/ncM7hAJ6DjTRG4xucaK3/wO/223Px + fD6/59ke4mQllUo1peO7i0zIdsRsr4D9agHrM4H1GMBtzv7kwm4nwzBNdfz/UBRFstH1UiZohRBeA79l + RmRNg7BlAjHbBA435yB8fo+EebTCxwLGuvYnNE0vs0EH8kEbtpdJLEwOQUeqoJ1ZAKkxQUUaoVWr4FD3 + Im8dhmCRIxdYDUhyMpkcZHc2kPcvwa4bxYZ3B7NOEdMOEWqbgBHzAQYNOfTpeBjcIiLWaaQ/vkDB0A8q + 4J4k6L1ghvHpseNdRblchtFziCm7CJVVwLlLV9BwsREv57Lo0WSqlZcYLuAEo+2GX9leJkJ2bSVDxXB8 + fCw1dc4Cxix5yE15NFxoxNnzl/F4msMjNYMn1Vpjamw+FsCXoTYQkXDolyAIKBaLKJVKWPMXqivz6Ndx + eKpl0DWZxgMVjTZFCu9sOYmpsTUnoB2oELTXJvDJXRQKBakRS3+HcolDN0lVp6bQPpbA3Tdx9ExR2NoX + JabGcmEfEor7JSIRDb/NbOqRrV7hgE1CFEX4ozzI5RS6xqN4OBbByHwCnlBGEgWeBe9ZBKVohUspc0mX + 2Ntyu+iVceQdamSqG+X2/WyWo5K5XC7+92Wz2Tjjd7Hcghypqmwd6GRBEKekD2rxfbIYNiaGy9/m+sCb + XoG3qcA5NGDtGnCrJGjDa9DKdlhkdyomxXOvXXbtdF39F7O844yxv/WmTtYyM/+shTf33vphkd0+0j9p + Luo7m9c1HTc6P9y7frWOn4gQxG/mLxeelTqaEAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKRSURBVDhPvZJfSFNhGMa/6I8EXXgR0YUUhpCFFwWxIhMC - QeoquoigpMjIRCsXiBhN54zZ5lxuMt1ybnY8Hq3N3HCWc5vgpttyUogOJhu4RLvqStzNmPR0vq+DFUR0 - 1QMfBx6+3/u87/sd8t/F8zzsdjv6+vrQ09NTScLhMOiZnZ3FzMwMpqen4fP5MDk5CY/HA5fLBafTiZGR - EQwODrK7uVwOGxsbMBgMcTI3N4ft7W1ks9m/nq2tLdhsti+bm5tYWVmBTqdLa7XaWhIKhZixvr6OaDSK - tbU1UC+dTsPv9yOVSmFiYoLdGR0dRTweZx2JcLk0FSGBQACRSIS2LAsGgxgbG5NRWBAEGR3DarXKKNzd - 3S0TPTa/Wq0ulnBCvF4vlpaW2A5WV1fZDmgyhROJxE7y0NAQFhcXaTqUSuUBCf8ht9uNTCaDqakpljw+ - Ps6Sabt6vV5Wz1/EvYHT6O/vR0tLCyTspxwOhyIWiyGZTILCNFn0sLy8DPp0D/gyqDw3cN1SjKampm8S - 9rs4jqObhsViQb1Qhkf8OdRwZ1BlOwWF6xocC0Y0OK+gouswCMguCfuz6vizcH/qxduPJga+XjDAEGgA - F+1AjVCBkud5uZ0i4lzHX4oym81003Rm3BXnpfALXz203jqo31ej1XMHbe/uwxJ6hspXF1DQSLKsgPgs - Cvo1Go3yzs7OzxqNRn7TegJvYgYIH/TgIh2whzVikVqYQ22oFi6hUEESBY/JflbAZDIpxN+SPdf8/DyG - h4dx1XwMl40FKO86hFJdPm4NnEdvsBVVfAUK5fnZoockj8G/qr29HSqVCs3NzXLJ2lGRcm/mNleOksaD - OKkk+yT733X0Cfl65OluECXZI1miCPkOEnfnn54KSIAAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKRSURBVDhPvZJfSFNhGMa/6I8EXXgRESFJEmTSRUGsqIRA + kLqKLiIoKTIy0VIDCaPNOWNrcy43mW45Nzsej9ZmbjjLOSe46bacFEMHEwWXaFddyXYzJj2d7+tgBRFd + 9cDHgYfv9z7v+36H/HfxPA+Hw4Genh50dXVVkHA4DHpmZmYwPT2Nqakp+P1+jI+Pw+v1wu12w+VyYWho + CP39/exuLpfDxsYGjEZjgszOzmJrawvZbPavJ51Ow263f9nc3MTS0hL0en1Kp9PVkFAoxIz19XVEo1Gs + ra2BeqlUCpOTk1hZWcHY2Bi7Mzw8jEQiwToS4TJpKkICgQAikQhtWRYMBjEyMiKjsCAIMjqGzWaTUbiz + s1Mmemx+tVpdLOGE+Hw+LCwssB2srq6yHdBkCieTye3kgYEBxONxmg6lUrlPwn/I4/Egk8lgYmKCJY+O + jrJk2q7BYJDV8xdxr+8Uent70dzcDAn7KafTKY/FYlheXgaFabLoYXFxEfTpHvClUHlv4Lq1GE1NTd8k + 7HdxHEc3DavVinqhFHX8WVRzp1FpPwm5+xqc8yY0uq6gvOMgCMgOCfuzavkz8HzqxtuPZga+njfCGGgE + F21DtVCOkud5ue0i4lzHXoqyWCx003Rm3BXnpfALfz10vlqo31ehxXsHre/uwxp6hopXF3CokWRZAfFZ + 5PRrMpka2tvbP2u12oabtuN4EzNC+GAAF2mDI6wVi9TAEmpFlXAJR+QkWfCI7GUFzGazXPwt2XPNzc1h + cHAQVy1FuGwqQFnHAZzX5+NW3zl0B1tQyZejsC4/e/QhyWPwr9JoNFCpVFAoFA2Sta0i5e7Mba4MJx7v + R4mS7JHsf1fhE/L18NOdIEqyS7JEEfIdCNfnk0idLcIAAAAASUVORK5CYII= diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index 7a3ec2c..64a8621 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -62,6 +62,7 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); @@ -146,6 +147,10 @@ this.label1 = new System.Windows.Forms.Label(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.label2 = new System.Windows.Forms.Label(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.tbManager = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.tbAdmin = new System.Windows.Forms.ToolStripTextBox(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -258,7 +263,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -376,7 +380,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -644,6 +647,10 @@ this.toolStripSeparator3, this.toolStripLabel3, this.tbRequest, + this.toolStripLabel6, + this.tbManager, + this.toolStripLabel7, + this.tbAdmin, this.toolStripSeparator4, this.btSearch, this.toolStripSeparator5, @@ -670,9 +677,8 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; - this.dtSD.Size = new System.Drawing.Size(90, 37); + this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dtSD.DoubleClick += new System.EventHandler(this.dtSD_DoubleClick); @@ -687,9 +693,8 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; - this.dtED.Size = new System.Drawing.Size(90, 37); + this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dtED.DoubleClick += new System.EventHandler(this.dtSD_DoubleClick); @@ -744,7 +749,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -858,7 +862,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1226, 569); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 7; - this.fpSpread1.SetViewportLeftColumn(0, 0, 5); + this.fpSpread1.SetViewportLeftColumn(0, 0, 7); // // label2 // @@ -872,13 +876,39 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(55, 34); + this.toolStripLabel6.Text = "구매담당"; + // + // tbManager + // + this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbManager.Name = "tbManager"; + this.tbManager.Size = new System.Drawing.Size(70, 37); + this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(55, 34); + this.toolStripLabel7.Text = "구매승인"; + // + // tbAdmin + // + this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbAdmin.Name = "tbAdmin"; + this.tbAdmin.Size = new System.Drawing.Size(70, 37); + this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 34; + this.fpSpread1_Sheet1.ColumnCount = 36; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -929,9 +959,13 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "구매담당"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "구매승인"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "IDX"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "SID#"; @@ -1171,13 +1205,21 @@ this.fpSpread1_Sheet1.Columns.Get(31).DataField = "chkremark"; this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = checkBoxCellType3; - this.fpSpread1_Sheet1.Columns.Get(32).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(32).Tag = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(32).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(33).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(33).Tag = "idx"; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(32).DataField = "purchase_manager"; + this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(33).DataField = "purchase_admin"; + this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(34).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(34).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(35).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(35).Tag = "idx"; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1298,6 +1340,10 @@ private System.Windows.Forms.ToolStripMenuItem 선택해제ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton6; private System.Windows.Forms.Label label2; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripTextBox tbManager; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripTextBox tbAdmin; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index b683df5..2ba4788 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -12,6 +12,7 @@ using NetOffice; using Outlook = NetOffice.OutlookApi; using NetOffice.OutlookApi.Enums; using FEQ0000.Purchase; +using FCOMMON; namespace FEQ0000 { @@ -209,6 +210,14 @@ namespace FEQ0000 cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)"; } + if (tbManager.Text.isEmpty() == false) + { + cmd.CommandText += $" and purchase_manager like '%{tbManager.Text.Replace("'", "''")}%'"; + } + if (tbAdmin.Text.isEmpty() == false) + { + cmd.CommandText += $" and purchase_admin like '%{tbAdmin.Text.Replace("'", "''")}%'"; + } if (cmbState.SelectedIndex != 0) { @@ -456,7 +465,15 @@ namespace FEQ0000 else newdr.request = FCOMMON.info.Login.no; - repeat: + + + var t1 = DBM.getCodeByCode("65", "01"); + var t2 = DBM.getCodeByCode("66", "01"); + newdr.purchase_manager = t1.title; + newdr.purchase_admin = t2.title; + + + repeat: bool repeat = false; DialogResult dlg; diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx index 02b759b..d1a21e5 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -147,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -176,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vQAADr0BR/uQrQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -211,7 +211,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vQAADr0BR/uQrQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs index 726326b..9e1cc77 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs @@ -52,6 +52,8 @@ System.Windows.Forms.Label label11; System.Windows.Forms.Label label12; System.Windows.Forms.Label label13; + System.Windows.Forms.Label label14; + System.Windows.Forms.Label label15; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -100,6 +102,8 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.tbAdmin = new System.Windows.Forms.TextBox(); + this.tbManager = new System.Windows.Forms.TextBox(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -122,6 +126,8 @@ label11 = new System.Windows.Forms.Label(); label12 = new System.Windows.Forms.Label(); label13 = new System.Windows.Forms.Label(); + label14 = new System.Windows.Forms.Label(); + label15 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); @@ -131,7 +137,7 @@ // receiveLabel // receiveLabel.AutoSize = true; - receiveLabel.Location = new System.Drawing.Point(44, 159); + receiveLabel.Location = new System.Drawing.Point(47, 159); receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); receiveLabel.Name = "receiveLabel"; receiveLabel.Size = new System.Drawing.Size(54, 20); @@ -141,7 +147,7 @@ // scLabel // scLabel.AutoSize = true; - scLabel.Location = new System.Drawing.Point(69, 65); + scLabel.Location = new System.Drawing.Point(72, 65); scLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); scLabel.Name = "scLabel"; scLabel.Size = new System.Drawing.Size(27, 20); @@ -201,7 +207,7 @@ // poLabel // poLabel.AutoSize = true; - poLabel.Location = new System.Drawing.Point(66, 95); + poLabel.Location = new System.Drawing.Point(69, 95); poLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); poLabel.Name = "poLabel"; poLabel.Size = new System.Drawing.Size(30, 20); @@ -232,7 +238,7 @@ // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(36, 126); + label5.Location = new System.Drawing.Point(39, 126); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(59, 20); @@ -295,7 +301,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(29, 230); + label2.Location = new System.Drawing.Point(32, 230); label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(69, 20); @@ -305,7 +311,7 @@ // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(19, 265); + label4.Location = new System.Drawing.Point(22, 265); label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; label4.Size = new System.Drawing.Size(79, 20); @@ -315,22 +321,22 @@ // label7 // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(9, 398); + label7.Location = new System.Drawing.Point(16, 398); label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; - label7.Size = new System.Drawing.Size(78, 20); + label7.Size = new System.Drawing.Size(73, 20); label7.TabIndex = 35; - label7.Text = "Line Code"; + label7.Text = "LineCode"; // // label11 // label11.AutoSize = true; - label11.Location = new System.Drawing.Point(-2, 370); + label11.Location = new System.Drawing.Point(5, 370); label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new System.Drawing.Size(89, 20); + label11.Size = new System.Drawing.Size(84, 20); label11.TabIndex = 33; - label11.Text = "Cost Center"; + label11.Text = "CostCenter"; // // label12 // @@ -513,7 +519,7 @@ // btSave // this.btSave.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btSave.Location = new System.Drawing.Point(512, 434); + this.btSave.Location = new System.Drawing.Point(512, 463); this.btSave.Margin = new System.Windows.Forms.Padding(4); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(410, 121); @@ -583,7 +589,7 @@ // chkInDate // this.chkInDate.AutoSize = true; - this.chkInDate.Location = new System.Drawing.Point(25, 193); + this.chkInDate.Location = new System.Drawing.Point(28, 193); this.chkInDate.Margin = new System.Windows.Forms.Padding(4); this.chkInDate.Name = "chkInDate"; this.chkInDate.Size = new System.Drawing.Size(73, 24); @@ -605,7 +611,7 @@ // chkExp // this.chkExp.AutoSize = true; - this.chkExp.Location = new System.Drawing.Point(24, 30); + this.chkExp.Location = new System.Drawing.Point(27, 30); this.chkExp.Margin = new System.Windows.Forms.Padding(4); this.chkExp.Name = "chkExp"; this.chkExp.Size = new System.Drawing.Size(73, 24); @@ -767,8 +773,12 @@ // groupBox2 // this.groupBox2.BackColor = System.Drawing.Color.Gainsboro; + this.groupBox2.Controls.Add(this.tbAdmin); this.groupBox2.Controls.Add(this.button7); + this.groupBox2.Controls.Add(label14); this.groupBox2.Controls.Add(this.tbInRemar); + this.groupBox2.Controls.Add(this.tbManager); + this.groupBox2.Controls.Add(label15); this.groupBox2.Controls.Add(label4); this.groupBox2.Controls.Add(this.tbInQty); this.groupBox2.Controls.Add(label2); @@ -788,7 +798,7 @@ this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(409, 420); + this.groupBox2.Size = new System.Drawing.Size(409, 448); this.groupBox2.TabIndex = 7; this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; @@ -796,7 +806,7 @@ // button7 // this.button7.Dock = System.Windows.Forms.DockStyle.Bottom; - this.button7.Location = new System.Drawing.Point(4, 381); + this.button7.Location = new System.Drawing.Point(4, 409); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(401, 35); this.button7.TabIndex = 16; @@ -885,6 +895,42 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // + // tbAdmin + // + this.tbAdmin.Location = new System.Drawing.Point(104, 364); + this.tbAdmin.Margin = new System.Windows.Forms.Padding(4); + this.tbAdmin.Name = "tbAdmin"; + this.tbAdmin.Size = new System.Drawing.Size(286, 27); + this.tbAdmin.TabIndex = 41; + // + // label14 + // + label14.AutoSize = true; + label14.Location = new System.Drawing.Point(2, 367); + label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label14.Name = "label14"; + label14.Size = new System.Drawing.Size(99, 20); + label14.TabIndex = 40; + label14.Text = "구매승인자명"; + // + // tbManager + // + this.tbManager.Location = new System.Drawing.Point(104, 335); + this.tbManager.Margin = new System.Windows.Forms.Padding(4); + this.tbManager.Name = "tbManager"; + this.tbManager.Size = new System.Drawing.Size(286, 27); + this.tbManager.TabIndex = 39; + // + // label15 + // + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(2, 339); + label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(99, 20); + label15.TabIndex = 38; + label15.Text = "구매담당자명"; + // // fPurchaseCR_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -970,5 +1016,7 @@ private System.Windows.Forms.Button button7; private System.Windows.Forms.TextBox tbBigoChk; private System.Windows.Forms.TextBox tbQtyReal; + private System.Windows.Forms.TextBox tbAdmin; + private System.Windows.Forms.TextBox tbManager; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 3431c9d..f09d4f3 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -131,7 +131,7 @@ namespace FEQ0000 } ///입력된 데이터를 적용한다. - dtPdate.Value = DateTime.Parse(dr.pdate); + //dtPdate.Value = DateTime.Parse(dr.pdate); if (cmbRequest.Items.Count > 0) { for (int i = 0; i < cmbRequest.Items.Count; i++) @@ -221,7 +221,8 @@ namespace FEQ0000 tbLineCode.Text = dr.linecode; else tbLineCode.Text = string.Empty; - + tbManager.Text = dr.purchase_manager; + tbAdmin.Text = dr.purchase_admin; //if (dr.process == "") cbProcess.SelectedIndex = -1; //else cbProcess.Text = dr.process; @@ -700,15 +701,15 @@ namespace FEQ0000 } - if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Added) - { - if (dr.sc != tbSC.Text.Trim() && tbSC.Text != "") - { - dtPdate.Value = DateTime.Now; - this.cmbState.SelectedValue = "Approving"; - //if (dr.state == "00") dr.state = "01"; //approv 변경 - } - } + //if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Added) + //{ + // if (dr.sc != tbSC.Text.Trim() && tbSC.Text != "") + // { + // //dtPdate.Value = DateTime.Now; + // this.cmbState.SelectedValue = "Approving"; + // //if (dr.state == "00") dr.state = "01"; //approv 변경 + // } + //} //품목정보에 없는 데이터이므로 자료를 추가한다. if (tbPumIDX.Text == "-1") @@ -816,6 +817,9 @@ namespace FEQ0000 dr.costcenter = tbCostCenter.Text; dr.linecode = tbLineCode.Text; + dr.purchase_manager = tbManager.Text; + dr.purchase_admin = tbAdmin.Text; + if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull(); else dr.supplyidx = int.Parse(tbSupplyIndex.Text); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx index 57f4cc4..9ad8419 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx @@ -207,6 +207,12 @@ * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + False + + + False + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) @@ -226,6 +232,12 @@ 313, 17 + + False + + + False + 58 diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index d5b938f..45a72d5 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -491,6 +491,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnchkremark; + private global::System.Data.DataColumn columnpurchase_manager; + + private global::System.Data.DataColumn columnpurchase_admin; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PurchaseDataTable() : @@ -909,6 +913,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_managerColumn { + get { + return this.columnpurchase_manager; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_adminColumn { + get { + return this.columnpurchase_admin; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -992,7 +1012,9 @@ namespace FEQ0000 { string costcenter, string linecode, int pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1041,7 +1063,9 @@ namespace FEQ0000 { costcenter, linecode, pumqtyReq, - chkremark}; + chkremark, + purchase_manager, + purchase_admin}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -1094,7 +1118,9 @@ namespace FEQ0000 { string costcenter, string linecode, int pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1143,7 +1169,9 @@ namespace FEQ0000 { costcenter, linecode, pumqtyReq, - chkremark}; + chkremark, + purchase_manager, + purchase_admin}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -1220,6 +1248,8 @@ namespace FEQ0000 { this.columnlinecode = base.Columns["linecode"]; this.columnpumqtyReq = base.Columns["pumqtyReq"]; this.columnchkremark = base.Columns["chkremark"]; + this.columnpurchase_manager = base.Columns["purchase_manager"]; + this.columnpurchase_admin = base.Columns["purchase_admin"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1319,6 +1349,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnpumqtyReq); this.columnchkremark = new global::System.Data.DataColumn("chkremark", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnchkremark); + this.columnpurchase_manager = new global::System.Data.DataColumn("purchase_manager", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_manager); + this.columnpurchase_admin = new global::System.Data.DataColumn("purchase_admin", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_admin); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1363,6 +1397,8 @@ namespace FEQ0000 { this.columncostcenter.MaxLength = 20; this.columnlinecode.MaxLength = 20; this.columnchkremark.MaxLength = 500; + this.columnpurchase_manager.MaxLength = 50; + this.columnpurchase_admin.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1596,6 +1632,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnchkremark; + private global::System.Data.DataColumn columnpurchase_manager; + + private global::System.Data.DataColumn columnpurchase_admin; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public EETGW_PurchaseCRDataTable() : @@ -2014,6 +2054,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_managerColumn { + get { + return this.columnpurchase_manager; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_adminColumn { + get { + return this.columnpurchase_admin; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2097,7 +2153,9 @@ namespace FEQ0000 { string costcenter, string linecode, int pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { EETGW_PurchaseCRRow rowEETGW_PurchaseCRRow = ((EETGW_PurchaseCRRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2146,7 +2204,9 @@ namespace FEQ0000 { costcenter, linecode, pumqtyReq, - chkremark}; + chkremark, + purchase_manager, + purchase_admin}; rowEETGW_PurchaseCRRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseCRRow); return rowEETGW_PurchaseCRRow; @@ -2199,7 +2259,9 @@ namespace FEQ0000 { string costcenter, string linecode, int pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { EETGW_PurchaseCRRow rowEETGW_PurchaseCRRow = ((EETGW_PurchaseCRRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2248,7 +2310,9 @@ namespace FEQ0000 { costcenter, linecode, pumqtyReq, - chkremark}; + chkremark, + purchase_manager, + purchase_admin}; rowEETGW_PurchaseCRRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseCRRow); return rowEETGW_PurchaseCRRow; @@ -2325,6 +2389,8 @@ namespace FEQ0000 { this.columnlinecode = base.Columns["linecode"]; this.columnpumqtyReq = base.Columns["pumqtyReq"]; this.columnchkremark = base.Columns["chkremark"]; + this.columnpurchase_manager = base.Columns["purchase_manager"]; + this.columnpurchase_admin = base.Columns["purchase_admin"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2424,6 +2490,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnpumqtyReq); this.columnchkremark = new global::System.Data.DataColumn("chkremark", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnchkremark); + this.columnpurchase_manager = new global::System.Data.DataColumn("purchase_manager", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_manager); + this.columnpurchase_admin = new global::System.Data.DataColumn("purchase_admin", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_admin); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2468,6 +2538,8 @@ namespace FEQ0000 { this.columncostcenter.MaxLength = 20; this.columnlinecode.MaxLength = 20; this.columnchkremark.MaxLength = 500; + this.columnpurchase_manager.MaxLength = 50; + this.columnpurchase_admin.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4486,6 +4558,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_manager { + get { + if (this.Ispurchase_managerNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.purchase_managerColumn])); + } + } + set { + this[this.tablePurchase.purchase_managerColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_admin { + get { + if (this.Ispurchase_adminNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.purchase_adminColumn])); + } + } + set { + this[this.tablePurchase.purchase_adminColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -5001,6 +5105,30 @@ namespace FEQ0000 { public void SetchkremarkNull() { this[this.tablePurchase.chkremarkColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_managerNull() { + return this.IsNull(this.tablePurchase.purchase_managerColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_managerNull() { + this[this.tablePurchase.purchase_managerColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_adminNull() { + return this.IsNull(this.tablePurchase.purchase_adminColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_adminNull() { + this[this.tablePurchase.purchase_adminColumn] = global::System.Convert.DBNull; + } } /// @@ -5749,6 +5877,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_manager { + get { + if (this.Ispurchase_managerNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_PurchaseCR.purchase_managerColumn])); + } + } + set { + this[this.tableEETGW_PurchaseCR.purchase_managerColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_admin { + get { + if (this.Ispurchase_adminNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_PurchaseCR.purchase_adminColumn])); + } + } + set { + this[this.tableEETGW_PurchaseCR.purchase_adminColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -6264,6 +6424,30 @@ namespace FEQ0000 { public void SetchkremarkNull() { this[this.tableEETGW_PurchaseCR.chkremarkColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_managerNull() { + return this.IsNull(this.tableEETGW_PurchaseCR.purchase_managerColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_managerNull() { + this[this.tableEETGW_PurchaseCR.purchase_managerColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_adminNull() { + return this.IsNull(this.tableEETGW_PurchaseCR.purchase_adminColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_adminNull() { + this[this.tableEETGW_PurchaseCR.purchase_adminColumn] = global::System.Convert.DBNull; + } } /// @@ -7655,6 +7839,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("linecode", "linecode"); tableMapping.ColumnMappings.Add("pumqtyReq", "pumqtyReq"); tableMapping.ColumnMappings.Add("chkremark", "chkremark"); + tableMapping.ColumnMappings.Add("purchase_manager", "purchase_manager"); + tableMapping.ColumnMappings.Add("purchase_admin", "purchase_admin"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -7699,7 +7885,10 @@ namespace FEQ0000.dsPurchaseTableAdapters { "stcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS " + "NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pum" + "qtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark" + - " = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)))"; + " = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsN" + + "ull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] " + + "= @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_ad" + + "min] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -7783,10 +7972,14 @@ namespace FEQ0000.dsPurchaseTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_admin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7831,6 +8024,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@linecode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "linecode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [" + @@ -7844,55 +8039,59 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN " = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [" + "winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costce" + "nter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremar" + - "k] = @chkremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdat" + - "e] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] " + - "IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process]" + - " IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [rec" + - "eive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc]" + - " IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS N" + - "ULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL" + - ") OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) O" + - "R ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS " + - "NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumun" + - "it] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [p" + - "umqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND" + - " [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt " + - "= 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply" + - " = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_suppl" + - "yidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((" + - "@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_pr" + - "ojectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_" + - "asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_eda" + - "te)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_ind" + - "ate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@Is" + - "Null_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @O" + - "riginal_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [impo" + - "rt] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pum" + - "idx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isd" + - "el] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] I" + - "S NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] " + - "IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [or" + - "derno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gco" + - "de) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place))" + - " AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AN" + - "D ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_p" + - "umpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @" + - "Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] " + - "= @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([winda" + - "te] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] " + - "= @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Orig" + - "inal_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcent" + - "er] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) " + - "OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq" + - "] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 A" + - "ND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)));\r\nSELECT idx, p" + - "date, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, requ" + - "est, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, p" + - "umqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, i" + - "ndate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gc" + - "ode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter," + - " linecode, pumqtyReq, chkremark FROM Purchase WHERE (idx = @idx) ORDER BY pdate " + - "DESC, idx DESC"; + "k] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @pur" + + "chase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] I" + + "S NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS N" + + "ULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS " + + "NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive" + + "] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS " + + "NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL)" + + " OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR" + + " ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([" + + "pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL" + + ") OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] " + + "IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqt" + + "y] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pu" + + "mprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 " + + "AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1" + + " AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx" + + " = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsN" + + "ull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projec" + + "tidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asse" + + "t)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate))" + + " AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)" + + ") AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull" + + "_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Origi" + + "nal_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] " + + "IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx]" + + " IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] " + + "IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NU" + + "LL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS N" + + "ULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [ordern" + + "o] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) " + + "AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND" + + " ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((" + + "@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpr" + + "iceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Orig" + + "inal_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @O" + + "riginal_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] " + + "= @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @O" + + "riginal_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original" + + "_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] " + + "= @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR (" + + "[linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS" + + " NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [" + + "chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purcha" + + "se_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Origina" + + "l_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NU" + + "LL) OR ([purchase_admin] = @Original_purchase_admin)));\r\nSELECT idx, pdate, stat" + + "e, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.g" + + "etUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pum" + + "price, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po," + + " dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place" + + ", inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode," + + " pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx" + + " = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7937,6 +8136,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@linecode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "linecode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -8019,6 +8220,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_admin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -8037,7 +8242,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark + winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -8063,19 +8268,19 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC"; + this._commandCollection[3].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx)"; + this._commandCollection[4].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx)"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; + this._commandCollection[5].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -8340,7 +8545,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_costcenter, string Original_linecode, global::System.Nullable Original_pumqtyReq, - string Original_chkremark) { + string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -8667,6 +8874,22 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[80].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[81].Value = ((string)(Original_chkremark)); } + if ((Original_purchase_manager == null)) { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[83].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[83].Value = ((string)(Original_purchase_manager)); + } + if ((Original_purchase_admin == null)) { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[85].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[85].Value = ((string)(Original_purchase_admin)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8730,7 +8953,9 @@ ORDER BY pdate DESC, idx DESC"; string costcenter, string linecode, global::System.Nullable pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -8984,6 +9209,18 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[42].Value = ((string)(chkremark)); } + if ((purchase_manager == null)) { + this.Adapter.InsertCommand.Parameters[43].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[43].Value = ((string)(purchase_manager)); + } + if ((purchase_admin == null)) { + this.Adapter.InsertCommand.Parameters[44].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[44].Value = ((string)(purchase_admin)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -9048,6 +9285,8 @@ ORDER BY pdate DESC, idx DESC"; string linecode, global::System.Nullable pumqtyReq, string chkremark, + string purchase_manager, + string purchase_admin, int Original_idx, string Original_pdate, string Original_state, @@ -9091,6 +9330,8 @@ ORDER BY pdate DESC, idx DESC"; string Original_linecode, global::System.Nullable Original_pumqtyReq, string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -9345,333 +9586,361 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(chkremark)); } - this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + if ((purchase_manager == null)) { + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(purchase_manager)); } - if ((Original_state == null)) { + if ((purchase_admin == null)) { + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(purchase_admin)); + } + this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_pdate)); } - if ((Original_process == null)) { + if ((Original_state == null)) { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_state)); } - if ((Original_receive == null)) { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_process)); } - if ((Original_sc == null)) { + if ((Original_receive == null)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_receive)); } - if ((Original_request == null)) { + if ((Original_sc == null)) { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_sc)); } - if ((Original_sid == null)) { + if ((Original_request == null)) { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_request)); } - if ((Original_pumname == null)) { + if ((Original_sid == null)) { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_sid)); } - if ((Original_pumscale == null)) { + if ((Original_pumname == null)) { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_pumname)); } - if ((Original_pumunit == null)) { + if ((Original_pumscale == null)) { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_pumscale)); } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((int)(Original_pumqty.Value)); - } - else { + if ((Original_pumunit == null)) { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } - if ((Original_pumprice.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_pumunit)); + } + if ((Original_pumqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_pumqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } - if ((Original_pumamt.HasValue == true)) { + if ((Original_pumprice.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((decimal)(Original_pumprice.Value)); } else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } - if ((Original_supply == null)) { + if ((Original_pumamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((decimal)(Original_pumamt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_supplyidx.Value)); - } - else { + if ((Original_supply == null)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - if ((Original_projectidx.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_supply)); + } + if ((Original_supplyidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_supplyidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } - if ((Original_asset == null)) { + if ((Original_projectidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((int)(Original_projectidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_asset)); - } - if ((Original_edate == null)) { + if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_asset)); } - if ((Original_indate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_edate)); } - if ((Original_po == null)) { + if ((Original_indate == null)) { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_indate)); } - if ((Original_dept == null)) { + if ((Original_po == null)) { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_po)); + } + if ((Original_dept == null)) { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[87].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((bool)(Original_import.Value)); } else { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } - if ((Original_isdel.HasValue == true)) { + if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[93].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((int)(Original_pumidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; } - if ((Original_bigo == null)) { + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[95].Value = ((bool)(Original_isdel.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[95].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[95].Value = ((string)(Original_bigo)); - } - if ((Original_manuproc == null)) { + if ((Original_bigo == null)) { this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[97].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[97].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[97].Value = ((string)(Original_bigo)); } - if ((Original_orderno == null)) { + if ((Original_manuproc == null)) { this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[99].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[99].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[99].Value = ((string)(Original_manuproc)); + } + if ((Original_orderno == null)) { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[101].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[101].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[100].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_place)); - } - if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[104].Value = ((int)(Original_inqty.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; } - if ((Original_pumpriceD.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_place)); + } + if ((Original_inqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[106].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((int)(Original_inqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; } - if ((Original_inremark == null)) { + if ((Original_pumpriceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[108].Value = ((decimal)(Original_pumpriceD.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[108].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[108].Value = ((string)(Original_inremark)); - } - if ((Original_winuid == null)) { + if ((Original_inremark == null)) { this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[110].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_winuid)); + this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_inremark)); } - if ((Original_windate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[112].Value = ((System.DateTime)(Original_windate.Value)); - } - else { + if ((Original_winuid == null)) { this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[112].Value = global::System.DBNull.Value; } - if ((Original_chk1.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[112].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[114].Value = ((bool)(Original_chk1.Value)); + this.Adapter.UpdateCommand.Parameters[114].Value = ((System.DateTime)(Original_windate.Value)); } else { this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[114].Value = global::System.DBNull.Value; } - if ((Original_chk2.HasValue == true)) { + if ((Original_chk1.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[116].Value = ((bool)(Original_chk2.Value)); + this.Adapter.UpdateCommand.Parameters[116].Value = ((bool)(Original_chk1.Value)); } else { this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[116].Value = global::System.DBNull.Value; } - if ((Original_costcenter == null)) { + if ((Original_chk2.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[118].Value = ((bool)(Original_chk2.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[118].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[118].Value = ((string)(Original_costcenter)); - } - if ((Original_linecode == null)) { + if ((Original_costcenter == null)) { this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[120].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[120].Value = ((string)(Original_linecode)); + this.Adapter.UpdateCommand.Parameters[120].Value = ((string)(Original_costcenter)); } - if ((Original_pumqtyReq.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[122].Value = ((int)(Original_pumqtyReq.Value)); - } - else { + if ((Original_linecode == null)) { this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[122].Value = global::System.DBNull.Value; } - if ((Original_chkremark == null)) { + else { + this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[122].Value = ((string)(Original_linecode)); + } + if ((Original_pumqtyReq.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[124].Value = ((int)(Original_pumqtyReq.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[124].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[124].Value = ((string)(Original_chkremark)); + if ((Original_chkremark == null)) { + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[126].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[125].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[126].Value = ((string)(Original_chkremark)); + } + if ((Original_purchase_manager == null)) { + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[128].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[128].Value = ((string)(Original_purchase_manager)); + } + if ((Original_purchase_admin == null)) { + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[130].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[130].Value = ((string)(Original_purchase_admin)); + } + this.Adapter.UpdateCommand.Parameters[131].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -9736,6 +10005,8 @@ ORDER BY pdate DESC, idx DESC"; string linecode, global::System.Nullable pumqtyReq, string chkremark, + string purchase_manager, + string purchase_admin, int Original_idx, string Original_pdate, string Original_state, @@ -9778,8 +10049,10 @@ ORDER BY pdate DESC, idx DESC"; string Original_costcenter, string Original_linecode, global::System.Nullable Original_pumqtyReq, - string Original_chkremark) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_idx); + string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_purchase_manager, Original_purchase_admin, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10048,6 +10321,8 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("linecode", "linecode"); tableMapping.ColumnMappings.Add("pumqtyReq", "pumqtyReq"); tableMapping.ColumnMappings.Add("chkremark", "chkremark"); + tableMapping.ColumnMappings.Add("purchase_manager", "purchase_manager"); + tableMapping.ColumnMappings.Add("purchase_admin", "purchase_admin"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -10092,7 +10367,10 @@ ORDER BY pdate DESC, idx DESC"; " OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linec" + "ode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 " + "AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_c" + - "hkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)))"; + "hkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AN" + + "D ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_m" + + "anager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [pur" + + "chase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -10176,10 +10454,31 @@ ORDER BY pdate DESC, idx DESC"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_admin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [re" + + "quest], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt]," + + " [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po" + + "], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [or" + + "derno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate]," + + " [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_m" + + "anager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @req" + + "uest, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply," + + " @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, " + + "@wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @i" + + "nqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @line" + + "code, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin);\r\nSELECT idx, " + + "pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, req" + + "uest, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, " + + "pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, " + + "indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, g" + + "code, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter" + + ", linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_Pu" + + "rchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10224,6 +10523,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@linecode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "linecode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @pr" + @@ -10237,55 +10538,59 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN " [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inr" + "emark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2," + " [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [" + - "chkremark] = @chkremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 A" + - "ND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND " + - "[state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [" + - "process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 " + - "AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 " + - "AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [reque" + - "st] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid]" + - " IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS" + - " NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumsc" + - "ale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AN" + - "D [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = " + - "1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice" + - " = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull" + - "_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNul" + - "l_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNu" + - "ll_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)" + - ") AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Ori" + - "ginal_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @O" + - "riginal_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Orig" + - "inal_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Orig" + - "inal_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) A" + - "ND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wu" + - "id] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 A" + - "ND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 " + - "AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 " + - "AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND " + - "[bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [ma" + - "nuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1" + - " AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Orig" + - "inal_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original" + - "_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_in" + - "qty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Or" + - "iginal_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inrem" + - "ark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([" + - "winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR" + - " ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR " + - "([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2]" + - " = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([" + - "costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] I" + - "S NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [p" + - "umqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkrema" + - "rk = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)));\r\nSELEC" + - "T idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, " + - "sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pu" + - "munit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, " + - "edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, ord" + - "erno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, cos" + - "tcenter, linecode, pumqtyReq, chkremark FROM EETGW_PurchaseCR WHERE (idx = @idx)" + - " ORDER BY pdate DESC, idx DESC"; + "chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin" + + "] = @purchase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [" + + "pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [sta" + + "te] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [proc" + + "ess] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND " + + "[receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND " + + "[sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] " + + "IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS " + + "NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NUL" + + "L) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale]" + + " IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [p" + + "umunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AN" + + "D [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1" + + " AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pum" + + "amt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_su" + + "pply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_s" + + "upplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AN" + + "D ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Origina" + + "l_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Origi" + + "nal_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original" + + "_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original" + + "_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND (" + + "(@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] " + + "= @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [" + + "import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND " + + "[pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND " + + "[isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [big" + + "o] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manupr" + + "oc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND" + + " [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original" + + "_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_pla" + + "ce)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)" + + ") AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Origin" + + "al_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark]" + + " = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winu" + + "id] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([w" + + "indate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([ch" + + "k1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @" + + "Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([cost" + + "center] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NU" + + "LL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqt" + + "yReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark =" + + " 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNul" + + "l_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = " + + "@Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admi" + + "n] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)));\r\nSELECT idx, pda" + + "te, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, reques" + + "t, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pum" + + "qty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, ind" + + "ate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcod" + + "e, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, l" + + "inecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_Purch" + + "aseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10330,6 +10635,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@linecode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "linecode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -10412,6 +10719,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqtyReq", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqtyReq", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_purchase_admin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_purchase_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "purchase_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -10430,7 +10741,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark + winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -10456,14 +10767,14 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx)"; + this._commandCollection[3].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; this._commandCollection[4].CommandText = @"SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid, inremark, - winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode + winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC"; @@ -10671,7 +10982,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_costcenter, string Original_linecode, global::System.Nullable Original_pumqtyReq, - string Original_chkremark) { + string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -10998,6 +11311,22 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[80].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[81].Value = ((string)(Original_chkremark)); } + if ((Original_purchase_manager == null)) { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[83].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[83].Value = ((string)(Original_purchase_manager)); + } + if ((Original_purchase_admin == null)) { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[85].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[85].Value = ((string)(Original_purchase_admin)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -11061,7 +11390,9 @@ ORDER BY pdate DESC, idx DESC"; string costcenter, string linecode, global::System.Nullable pumqtyReq, - string chkremark) { + string chkremark, + string purchase_manager, + string purchase_admin) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11315,6 +11646,18 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[42].Value = ((string)(chkremark)); } + if ((purchase_manager == null)) { + this.Adapter.InsertCommand.Parameters[43].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[43].Value = ((string)(purchase_manager)); + } + if ((purchase_admin == null)) { + this.Adapter.InsertCommand.Parameters[44].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[44].Value = ((string)(purchase_admin)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -11379,6 +11722,8 @@ ORDER BY pdate DESC, idx DESC"; string linecode, global::System.Nullable pumqtyReq, string chkremark, + string purchase_manager, + string purchase_admin, int Original_idx, string Original_pdate, string Original_state, @@ -11422,6 +11767,8 @@ ORDER BY pdate DESC, idx DESC"; string Original_linecode, global::System.Nullable Original_pumqtyReq, string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -11676,333 +12023,361 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(chkremark)); } - this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + if ((purchase_manager == null)) { + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(purchase_manager)); } - if ((Original_state == null)) { + if ((purchase_admin == null)) { + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(purchase_admin)); + } + this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_pdate)); } - if ((Original_process == null)) { + if ((Original_state == null)) { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_state)); } - if ((Original_receive == null)) { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_process)); } - if ((Original_sc == null)) { + if ((Original_receive == null)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_receive)); } - if ((Original_request == null)) { + if ((Original_sc == null)) { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_sc)); } - if ((Original_sid == null)) { + if ((Original_request == null)) { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_request)); } - if ((Original_pumname == null)) { + if ((Original_sid == null)) { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_sid)); } - if ((Original_pumscale == null)) { + if ((Original_pumname == null)) { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_pumname)); } - if ((Original_pumunit == null)) { + if ((Original_pumscale == null)) { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_pumscale)); } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((int)(Original_pumqty.Value)); - } - else { + if ((Original_pumunit == null)) { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } - if ((Original_pumprice.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_pumunit)); + } + if ((Original_pumqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_pumqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } - if ((Original_pumamt.HasValue == true)) { + if ((Original_pumprice.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((decimal)(Original_pumprice.Value)); } else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } - if ((Original_supply == null)) { + if ((Original_pumamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((decimal)(Original_pumamt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_supplyidx.Value)); - } - else { + if ((Original_supply == null)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - if ((Original_projectidx.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_supply)); + } + if ((Original_supplyidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_supplyidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } - if ((Original_asset == null)) { + if ((Original_projectidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((int)(Original_projectidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_asset)); - } - if ((Original_edate == null)) { + if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_asset)); } - if ((Original_indate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_edate)); } - if ((Original_po == null)) { + if ((Original_indate == null)) { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_indate)); } - if ((Original_dept == null)) { + if ((Original_po == null)) { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_po)); + } + if ((Original_dept == null)) { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[87].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((bool)(Original_import.Value)); } else { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } - if ((Original_isdel.HasValue == true)) { + if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[93].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((int)(Original_pumidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; } - if ((Original_bigo == null)) { + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[95].Value = ((bool)(Original_isdel.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[95].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[95].Value = ((string)(Original_bigo)); - } - if ((Original_manuproc == null)) { + if ((Original_bigo == null)) { this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[97].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[97].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[97].Value = ((string)(Original_bigo)); } - if ((Original_orderno == null)) { + if ((Original_manuproc == null)) { this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[99].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[99].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[99].Value = ((string)(Original_manuproc)); + } + if ((Original_orderno == null)) { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[101].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[101].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[100].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_place)); - } - if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[104].Value = ((int)(Original_inqty.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; } - if ((Original_pumpriceD.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_place)); + } + if ((Original_inqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[106].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((int)(Original_inqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; } - if ((Original_inremark == null)) { + if ((Original_pumpriceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[108].Value = ((decimal)(Original_pumpriceD.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[108].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[108].Value = ((string)(Original_inremark)); - } - if ((Original_winuid == null)) { + if ((Original_inremark == null)) { this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[110].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_winuid)); + this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_inremark)); } - if ((Original_windate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[112].Value = ((System.DateTime)(Original_windate.Value)); - } - else { + if ((Original_winuid == null)) { this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[112].Value = global::System.DBNull.Value; } - if ((Original_chk1.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[112].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[114].Value = ((bool)(Original_chk1.Value)); + this.Adapter.UpdateCommand.Parameters[114].Value = ((System.DateTime)(Original_windate.Value)); } else { this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[114].Value = global::System.DBNull.Value; } - if ((Original_chk2.HasValue == true)) { + if ((Original_chk1.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[116].Value = ((bool)(Original_chk2.Value)); + this.Adapter.UpdateCommand.Parameters[116].Value = ((bool)(Original_chk1.Value)); } else { this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[116].Value = global::System.DBNull.Value; } - if ((Original_costcenter == null)) { + if ((Original_chk2.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[118].Value = ((bool)(Original_chk2.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[118].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[118].Value = ((string)(Original_costcenter)); - } - if ((Original_linecode == null)) { + if ((Original_costcenter == null)) { this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[120].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[120].Value = ((string)(Original_linecode)); + this.Adapter.UpdateCommand.Parameters[120].Value = ((string)(Original_costcenter)); } - if ((Original_pumqtyReq.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[122].Value = ((int)(Original_pumqtyReq.Value)); - } - else { + if ((Original_linecode == null)) { this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[122].Value = global::System.DBNull.Value; } - if ((Original_chkremark == null)) { + else { + this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[122].Value = ((string)(Original_linecode)); + } + if ((Original_pumqtyReq.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[124].Value = ((int)(Original_pumqtyReq.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[124].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[124].Value = ((string)(Original_chkremark)); + if ((Original_chkremark == null)) { + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[126].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[125].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[126].Value = ((string)(Original_chkremark)); + } + if ((Original_purchase_manager == null)) { + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[128].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[128].Value = ((string)(Original_purchase_manager)); + } + if ((Original_purchase_admin == null)) { + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[130].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[130].Value = ((string)(Original_purchase_admin)); + } + this.Adapter.UpdateCommand.Parameters[131].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -12067,6 +12442,8 @@ ORDER BY pdate DESC, idx DESC"; string linecode, global::System.Nullable pumqtyReq, string chkremark, + string purchase_manager, + string purchase_admin, int Original_idx, string Original_pdate, string Original_state, @@ -12109,8 +12486,10 @@ ORDER BY pdate DESC, idx DESC"; string Original_costcenter, string Original_linecode, global::System.Nullable Original_pumqtyReq, - string Original_chkremark) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_idx); + string Original_chkremark, + string Original_purchase_manager, + string Original_purchase_admin) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_purchase_manager, Original_purchase_admin, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 96d81a4..eb077a2 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark))) + DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin))) @@ -96,13 +96,17 @@ + + + + - INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC + INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -147,6 +151,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -154,7 +160,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark + winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -165,8 +171,8 @@ ORDER BY pdate DESC, idx DESC - UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark))); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC + UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin))); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -211,6 +217,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -293,6 +301,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + + + @@ -346,6 +358,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -385,7 +399,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC + SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC @@ -397,7 +411,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx) + SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx) @@ -407,7 +421,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC + SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -423,7 +437,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - DELETE FROM [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark))) + DELETE FROM [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin))) @@ -507,13 +521,17 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc + + + + - INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC + INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -558,6 +576,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -565,7 +585,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark + winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -576,8 +596,8 @@ ORDER BY pdate DESC, idx DESC - UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark))); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC + UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin))); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -622,6 +642,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -704,6 +726,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + + + @@ -757,6 +783,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -797,7 +825,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx) + SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx) @@ -809,7 +837,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid, inremark, - winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode + winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC @@ -1124,13 +1152,27 @@ ORDER BY source DESC, request, wdate DESC - + + + + + + + + + + + + + + + @@ -1357,13 +1399,27 @@ ORDER BY source DESC, request, wdate DESC - + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index ceeca4f..4b5cab1 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -202,6 +202,7 @@ this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); + this.timer1 = new System.Windows.Forms.Timer(this.components); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -2015,6 +2016,11 @@ // this.taHistD.ClearBeforeFill = true; // + // timer1 + // + this.timer1.Interval = 300; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2193,5 +2199,6 @@ private System.Windows.Forms.BindingSource bsHistD; private dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter taHistD; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 1d47bcd..ca84bb3 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -23,7 +23,7 @@ namespace FPJ0000 void __Closed(object sender, FormClosedEventArgs e) { - + timer1.Stop(); } private void __Load(object sender, EventArgs e) @@ -42,7 +42,7 @@ namespace FPJ0000 " order by category"; var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); cn.Open(); var rdr = cmd.ExecuteReader(); - while(rdr.Read()) + while (rdr.Read()) { var category = rdr[0].ToString(); cmbCate.Items.Add(category); @@ -135,7 +135,7 @@ namespace FPJ0000 foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns) col.Locked = true; } - + timer1.Start(); } @@ -580,6 +580,7 @@ namespace FPJ0000 f.ShowDialog(); } + bool Alert_DDate = false; private void bs_CurrentChanged(object sender, EventArgs e) { //히스토리 데이터를 업데이트하고 첫번재 자료를 표시한다. @@ -594,6 +595,19 @@ namespace FPJ0000 button2.BackColor = dr.jasmin > 0 ? Color.Lime : SystemColors.Control; + if (dr.status == "진행" && dr.edate.isEmpty()) + { + if (DateTime.TryParse(dr.ddate, out DateTime dd)) + { + if (dd <= DateTime.Now) Alert_DDate = true; + else Alert_DDate = false; + } + else Alert_DDate = false; + } + else Alert_DDate = false; + + + var progress = FCOMMON.DBM.GetProjectBuyInfo(dr.idx); //var sql = "select ((sum((case when isnull(qtybuy,0) = isnull(qtyin,0) then 1 else 0 end))*1.0) / count(*))*100 " + @@ -1051,6 +1065,16 @@ namespace FPJ0000 } - + private void timer1_Tick(object sender, EventArgs e) + { + if (Alert_DDate) + { + if (label8.BackColor == Color.Gold) + label8.BackColor = SystemColors.Control; + else + label8.BackColor = Color.Gold; + } + else label8.BackColor = SystemColors.Control; + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 58a1ef4..16520c6 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -339,13 +339,13 @@ 248, 17 - 110, 56 + 1122, 17 455, 17 - 1086, 17 + 934, 17 561, 17 @@ -540,7 +540,10 @@ - 17, 56 + 1029, 17 + + + 1274, 17 82