diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs index 825f6b6..db907e7 100644 --- a/Project/Properties/Settings.Designer.cs +++ b/Project/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Project.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -27,7 +27,7 @@ namespace Project.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string gwcs { get { return ((string)(this["gwcs"])); @@ -38,7 +38,7 @@ namespace Project.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string CS { get { return ((string)(this["CS"])); diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings index d615f27..4d86415 100644 --- a/Project/Properties/Settings.settings +++ b/Project/Properties/Settings.settings @@ -4,18 +4,19 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True \ No newline at end of file diff --git a/Project/app.config b/Project/app.config index 73b67fc..c5e93f2 100644 --- a/Project/app.config +++ b/Project/app.config @@ -2,16 +2,26 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.cs index b7f4cd2..5aeaba8 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.cs +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.cs @@ -40,7 +40,7 @@ namespace FBS0000 this.tbMon.Text = DateTime.Now.ToShortDateString(); refrehData(); - // this.reportViewer1.RefreshReport(); + // this.reportViewer1.RefreshReport(); } void refrehData() @@ -110,7 +110,8 @@ namespace FBS0000 else if (catename.StartsWith("이월")) newdr.orderno = 0; else newdr.orderno = 2; - this.dsReport.holydatasum.AddholydatasumRow(newdr); + if (newdr.dr == 0 && newdr.drday == 0 && newdr.cr == 0 && newdr.crday == 0) newdr.Delete(); + else this.dsReport.holydatasum.AddholydatasumRow(newdr); } } this.dsReport.holydatasum.AcceptChanges(); @@ -173,7 +174,7 @@ namespace FBS0000 //최종합계추가 - this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계"; + this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계(대체/외출 제외)"; var grpstart2 = headercol; foreach (var colname in subcols) { @@ -194,9 +195,9 @@ namespace FBS0000 var col = 0; var druser = dr.First(); - if(row % 2 == 0) + if (row % 2 == 0) { - fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80,Color.LightSkyBlue); + fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80, Color.LightSkyBlue); } else fpSpread1_Sheet1.Rows[row].BackColor = Color.White; @@ -261,12 +262,15 @@ namespace FBS0000 else cateColumn++; + if (cateName.StartsWith("대체") == false && cateName.StartsWith("외출") == false) + { + sum_이월 += 이월; + sum_발생 += 발생; + sum_사용 += 사용; + sum_잔여 += 잔여; + sum_초과 += 초과; + } - sum_이월 += 이월; - sum_발생 += 발생; - sum_사용 += 사용; - sum_잔여 += 잔여; - sum_초과 += 초과; if (cateColumn > lastcol) lastcol = cateColumn; } @@ -303,8 +307,8 @@ namespace FBS0000 fpSpread1_Sheet1.SetFormula(row, 3, $"SUM(R1C4:R{row}C4)"); //0번컬럼은 색상을 초기화 - for(int i = 0; i < fpSpread1_Sheet1.RowCount;i++) - fpSpread1_Sheet1.Cells[i,0].BackColor = Color.White; + for (int i = 0; i < fpSpread1_Sheet1.RowCount; i++) + fpSpread1_Sheet1.Cells[i, 0].BackColor = Color.White; @@ -346,7 +350,7 @@ namespace FBS0000 title = fpSpread1_Sheet1.ColumnHeader.Cells[0, i].Text; } var title2 = fpSpread1_Sheet1.ColumnHeader.Cells[1, i].Text; - if(title != "년차" && title != "합계" && title2 == "초과") + if (title != "년차" && title != "합계" && title2 == "초과") { fpSpread1_Sheet1.Columns[i].Visible = false; } diff --git a/SubProject/FEQ0000/Properties/Settings.Designer.cs b/SubProject/FEQ0000/Properties/Settings.Designer.cs index df52308..3151cba 100644 --- a/SubProject/FEQ0000/Properties/Settings.Designer.cs +++ b/SubProject/FEQ0000/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FEQ0000.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -27,7 +27,7 @@ namespace FEQ0000.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=True;TrustServerCertificate=True")] public string gwcs { get { return ((string)(this["gwcs"])); @@ -38,7 +38,7 @@ namespace FEQ0000.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string EEEntities { get { return ((string)(this["EEEntities"])); diff --git a/SubProject/FEQ0000/Properties/Settings.settings b/SubProject/FEQ0000/Properties/Settings.settings index b42fa48..532200d 100644 --- a/SubProject/FEQ0000/Properties/Settings.settings +++ b/SubProject/FEQ0000/Properties/Settings.settings @@ -5,17 +5,18 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=True;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=True;TrustServerCertificate=True <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 8b190e6..7908014 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -166,8 +166,6 @@ namespace FEQ0000 } else cmbReceive.Text = dr.receive; - - tbSID.Text = dr.sid; tbSID.Tag = tbSID.Text; tbStorage.Text = dr.place; @@ -373,6 +371,9 @@ namespace FEQ0000 case "tbsupply": Lov_Supply(search, false); break; + case "tbbigo": + e.Handled = true; + break; default: SendKeys.Send("{TAB}"); break; diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs index aedffbe..2becf41 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs @@ -40,27 +40,28 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); @@ -145,9 +146,9 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -882,7 +883,30 @@ this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); - this.fpSpread1.SetViewportLeftColumn(0, 0, 1); + // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + 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(1334, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + 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(1334, 23); + this.label2.TabIndex = 7; + this.label2.Text = "--"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // fpSpread1_Sheet1 // @@ -890,7 +914,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 = 33; + this.fpSpread1_Sheet1.ColumnCount = 34; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -898,31 +922,31 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SC#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "수령"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "수량\r\n(요청)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량\r\n(구매)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단가\r\n(해외)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "통화"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "합계금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "공급업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SC#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "수령"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량\r\n(요청)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "수량\r\n(구매)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "단가\r\n(해외)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "통화"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "공급업체"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고(구매사유)\r\n(요청자)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "입고예정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "비고\r\n(담당자)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고(구매사유)\r\n(요청자)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고예정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "비고\r\n(담당자)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; @@ -960,100 +984,106 @@ this.fpSpread1_Sheet1.Columns.Get(3).Width = 100F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "oversea"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 70F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; - this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "요청"; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "SC#"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Visible = false; this.fpSpread1_Sheet1.Columns.Get(6).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "crcf"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Visible = false; this.fpSpread1_Sheet1.Columns.Get(7).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "수령"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoSort = true; this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "sid"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType1.DecimalPlaces = 0; numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType1.MaximumValue = 2147483647D; numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "규격"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F; numberCellType2.DecimalPlaces = 0; numberCellType2.NegativeRed = true; numberCellType2.NullDisplay = "--"; numberCellType2.Separator = ","; numberCellType2.ShowSeparator = true; numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqtyReq"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량\r\n(요청)"; - this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F; - numberCellType3.DecimalPlaces = 0; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(구매)"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(요청)"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit"; + numberCellType3.DecimalPlaces = 0; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량\r\n(구매)"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 119F; - numberCellType4.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumpriceD"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가\r\n(해외)"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "currency"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "통화"; + numberCellType4.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumpriceD"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "단가\r\n(해외)"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "currency"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "통화"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F; numberCellType5.DecimalPlaces = 0; numberCellType5.MaximumValue = 9999999999999.99D; numberCellType5.MinimumValue = -9999999999999.99D; @@ -1062,12 +1092,12 @@ numberCellType5.Separator = ","; numberCellType5.ShowSeparator = true; numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F; numberCellType6.DecimalPlaces = 0; numberCellType6.MaximumValue = 9999999999999.99D; numberCellType6.MinimumValue = -9999999999999.99D; @@ -1076,118 +1106,118 @@ numberCellType6.Separator = ","; numberCellType6.ShowSeparator = true; numberCellType6.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt"; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체"; - this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체"; + this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType7.DecimalPlaces = 0; numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType7.MaximumValue = 2147483647D; numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType8.DecimalPlaces = 0; numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType8.MaximumValue = 2147483647D; numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(21).Tag = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F; - textCellType15.WordWrap = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고(구매사유)\r\n(요청자)"; - this.fpSpread1_Sheet1.Columns.Get(22).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; this.fpSpread1_Sheet1.Columns.Get(22).Width = 119F; + textCellType16.WordWrap = true; this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고(구매사유)\r\n(요청자)"; + this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(24).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F; numberCellType9.DecimalPlaces = 0; numberCellType9.NegativeRed = true; numberCellType9.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "PO#"; - this.fpSpread1_Sheet1.Columns.Get(26).Tag = "po"; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량"; + this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F; - textCellType19.WordWrap = true; this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "chkremark"; - this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "비고\r\n(담당자)"; - this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#"; + this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(27).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨"; - this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel"; + textCellType20.WordWrap = true; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "chkremark"; + this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "비고\r\n(담당자)"; + this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Width = 119F; - this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(29).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(29).Tag = "idx"; - this.fpSpread1_Sheet1.Columns.Get(29).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel"; this.fpSpread1_Sheet1.Columns.Get(29).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(30).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(30).DataField = "conf_status"; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(30).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(30).Tag = "conf_status"; + this.fpSpread1_Sheet1.Columns.Get(30).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(30).Visible = false; this.fpSpread1_Sheet1.Columns.Get(30).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(31).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_request"; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(31).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_request"; + this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(31).Visible = false; this.fpSpread1_Sheet1.Columns.Get(31).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(32).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(32).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(32).Visible = false; this.fpSpread1_Sheet1.Columns.Get(32).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(33).BackColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(33).DataField = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(33).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(33).Tag = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(33).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(33).Width = 119F; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1195,30 +1225,6 @@ this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - 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(1334, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - 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(1334, 23); - this.label2.TabIndex = 7; - this.label2.Text = "--"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchaseEB // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1329,7 +1335,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton8; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem; @@ -1337,5 +1342,6 @@ private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx index 21f706b..d6e4a23 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx @@ -427,7 +427,7 @@ - 577, 17 + 579, 17 65 diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs index cac986c..efc2e18 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs @@ -49,6 +49,7 @@ System.Windows.Forms.Label label15; System.Windows.Forms.Label label18; System.Windows.Forms.Label label2; + System.Windows.Forms.Label label4; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -71,6 +72,7 @@ this.chkInDate = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.lbcurrentwon = new System.Windows.Forms.Label(); this.cmbDept = new System.Windows.Forms.ComboBox(); this.cmbSite = new System.Windows.Forms.ComboBox(); this.cmbRemark = new System.Windows.Forms.ComboBox(); @@ -94,7 +96,7 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.lbcurrentwon = new System.Windows.Forms.Label(); + this.cmbOverSeas = new System.Windows.Forms.ComboBox(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -114,6 +116,7 @@ label15 = new System.Windows.Forms.Label(); label18 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -591,6 +594,18 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; // + // lbcurrentwon + // + this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue; + this.lbcurrentwon.Location = new System.Drawing.Point(312, 202); + this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbcurrentwon.Name = "lbcurrentwon"; + this.lbcurrentwon.Size = new System.Drawing.Size(161, 28); + this.lbcurrentwon.TabIndex = 55; + this.lbcurrentwon.Text = "통화기호를 선택하세요"; + this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // cmbDept // this.cmbDept.FormattingEnabled = true; @@ -700,6 +715,8 @@ // groupBox2 // this.groupBox2.BackColor = System.Drawing.Color.Gainsboro; + this.groupBox2.Controls.Add(this.cmbOverSeas); + this.groupBox2.Controls.Add(label4); this.groupBox2.Controls.Add(this.dtExpDate); this.groupBox2.Controls.Add(this.chkExp); this.groupBox2.Controls.Add(this.cmbReceive); @@ -826,17 +843,29 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // lbcurrentwon + // cmbOverSeas // - this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue; - this.lbcurrentwon.Location = new System.Drawing.Point(312, 202); - this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lbcurrentwon.Name = "lbcurrentwon"; - this.lbcurrentwon.Size = new System.Drawing.Size(161, 28); - this.lbcurrentwon.TabIndex = 55; - this.lbcurrentwon.Text = "통화기호를 선택하세요"; - this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.cmbOverSeas.FormattingEnabled = true; + this.cmbOverSeas.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.cmbOverSeas.Items.AddRange(new object[] { + "NR", + "SPR", + "전자실"}); + this.cmbOverSeas.Location = new System.Drawing.Point(136, 346); + this.cmbOverSeas.Margin = new System.Windows.Forms.Padding(4); + this.cmbOverSeas.Name = "cmbOverSeas"; + this.cmbOverSeas.Size = new System.Drawing.Size(265, 28); + this.cmbOverSeas.TabIndex = 54; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(5, 350); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(123, 20); + label4.TabIndex = 53; + label4.Text = "Overseas Budget"; // // fPurchaseEB_Add // @@ -916,5 +945,6 @@ private System.Windows.Forms.CheckBox chkExp; private System.Windows.Forms.ComboBox cmbDept; private System.Windows.Forms.Label lbcurrentwon; + private System.Windows.Forms.ComboBox cmbOverSeas; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index 049350b..ceb49a7 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -117,6 +117,12 @@ namespace FEQ0000 this.cmbCurrency.ValueMember = "Value"; this.cmbCurrency.DataSource = LstCur; + //oversea + var LstOverSea = FCOMMON.DBM.getCodeTable("30"); + this.cmbOverSeas.DisplayMember = "Value"; + this.cmbOverSeas.ValueMember = "Value"; + this.cmbOverSeas.DataSource = LstOverSea; + //구매자비고 var LstRemark = FCOMMON.DBM.getCodeList("70"); @@ -233,6 +239,8 @@ namespace FEQ0000 cmbState.Text = dr.state; cmbSite.Text = dr.site; cmbDept.Text = dr.dept; + cmbOverSeas.Text = dr.oversea; + tbSC.Text = dr.sc; tbPO.Text = dr.po; @@ -353,6 +361,9 @@ namespace FEQ0000 case "tbsupply": Lov_Supply(search, false); break; + case "tbbigo": + e.Handled = true; + break; default: SendKeys.Send("{TAB}"); break; @@ -589,6 +600,7 @@ namespace FEQ0000 dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); dr.currency = cmbCurrency.Text.Trim(); dr.place = "전자실"; + dr.oversea = cmbOverSeas.Text.Trim(); if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx index 7cbf788..7f9e748 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx @@ -205,6 +205,9 @@ * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + False + 587, 17 diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs index 96aa74a..2271190 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs @@ -115,7 +115,7 @@ namespace FEQ0000 this.cmDate.SelectedIndex = 0; this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK; this.cmbSort.SelectedIndex = 0; - this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString(); + this.dtSD.Text = DateTime.Now.AddDays(-90).ToShortDateString(); this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString(); diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index 1dc8945..c6b62e2 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -430,6 +430,9 @@ namespace FEQ0000 case "tbsupply": Lov_Supply(search, false); break; + case "tbbigo": + e.Handled = true; + break; default: SendKeys.Send("{TAB}"); break; diff --git a/SubProject/FEQ0000/app.config b/SubProject/FEQ0000/app.config index 21efc26..ba23484 100644 --- a/SubProject/FEQ0000/app.config +++ b/SubProject/FEQ0000/app.config @@ -5,9 +5,12 @@
- - - + + + diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 4e86582..736fafc 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -4016,6 +4016,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnsite; + private global::System.Data.DataColumn columnoversea; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public EETGW_PurchaseEBDataTable() : @@ -4506,6 +4508,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn overseaColumn { + get { + return this.columnoversea; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4598,7 +4608,8 @@ namespace FEQ0000 { string conf_reponse, string bigo_admin, string bigo_manager, - string site) { + string site, + string oversea) { EETGW_PurchaseEBRow rowEETGW_PurchaseEBRow = ((EETGW_PurchaseEBRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4656,7 +4667,8 @@ namespace FEQ0000 { conf_reponse, bigo_admin, bigo_manager, - site}; + site, + oversea}; rowEETGW_PurchaseEBRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseEBRow); return rowEETGW_PurchaseEBRow; @@ -4718,7 +4730,8 @@ namespace FEQ0000 { string conf_reponse, string bigo_admin, string bigo_manager, - string site) { + string site, + string oversea) { EETGW_PurchaseEBRow rowEETGW_PurchaseEBRow = ((EETGW_PurchaseEBRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4776,7 +4789,8 @@ namespace FEQ0000 { conf_reponse, bigo_admin, bigo_manager, - site}; + site, + oversea}; rowEETGW_PurchaseEBRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseEBRow); return rowEETGW_PurchaseEBRow; @@ -4862,6 +4876,7 @@ namespace FEQ0000 { this.columnbigo_admin = base.Columns["bigo_admin"]; this.columnbigo_manager = base.Columns["bigo_manager"]; this.columnsite = base.Columns["site"]; + this.columnoversea = base.Columns["oversea"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4979,6 +4994,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnbigo_manager); this.columnsite = new global::System.Data.DataColumn("site", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsite); + this.columnoversea = new global::System.Data.DataColumn("oversea", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnoversea); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -5032,6 +5049,7 @@ namespace FEQ0000 { this.columnbigo_admin.MaxLength = 1000; this.columnbigo_manager.MaxLength = 1000; this.columnsite.MaxLength = 10; + this.columnoversea.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10293,6 +10311,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string oversea { + get { + if (this.IsoverseaNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_PurchaseEB.overseaColumn])); + } + } + set { + this[this.tableEETGW_PurchaseEB.overseaColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -10916,6 +10950,18 @@ namespace FEQ0000 { public void SetsiteNull() { this[this.tableEETGW_PurchaseEB.siteColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsoverseaNull() { + return this.IsNull(this.tableEETGW_PurchaseEB.overseaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetoverseaNull() { + this[this.tableEETGW_PurchaseEB.overseaColumn] = global::System.Convert.DBNull; + } } /// @@ -18030,6 +18076,7 @@ GROUP BY purchase_admin"; tableMapping.ColumnMappings.Add("bigo_admin", "bigo_admin"); tableMapping.ColumnMappings.Add("bigo_manager", "bigo_manager"); tableMapping.ColumnMappings.Add("site", "site"); + tableMapping.ColumnMappings.Add("oversea", "oversea"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -18086,7 +18133,8 @@ GROUP BY purchase_admin"; "sNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo" + "_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_ma" + "nager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR " + - "([site] = @Original_site)))"; + "([site] = @Original_site)) AND ((@IsNull_oversea = 1 AND [oversea] IS NULL) OR (" + + "[oversea] = @Original_oversea)))"; 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, "", "", "")); @@ -18188,6 +18236,8 @@ GROUP BY purchase_admin"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_site", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_oversea", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_oversea", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", 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_PurchaseEB] ([pdate], [state], [process], [receive], [sc], [re" + @@ -18197,22 +18247,22 @@ GROUP BY purchase_admin"; "derno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate]," + " [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_m" + "anager], [purchase_admin], [currency], [conf_status], [conf_request], [conf_repo" + - "nse], [bigo_admin], [bigo_manager], [site]) VALUES (@pdate, @state, @process, @r" + - "eceive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, " + - "@pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @p" + - "o, @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_admi" + - "n, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_man" + - "ager, @site);\r\nSELECT idx, pdate, state, process, receive, dbo.getUserName(recei" + - "ve) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, p" + - "umname, 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, wind" + - "ate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, p" + - "urchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bi" + - "go_manager, site FROM EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY p" + - "date DESC, idx DESC"; + "nse], [bigo_admin], [bigo_manager], [site], [oversea]) 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, @chk" + + "1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @pu" + + "rchase_admin, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin" + + ", @bigo_manager, @site, @oversea);\r\nSELECT idx, pdate, state, process, receive, " + + "dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) A" + + "S requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply" + + ", supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, i" + + "mport, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, i" + + "nremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark" + + ", purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_re" + + "ponse, bigo_admin, bigo_manager, site, oversea FROM EETGW_PurchaseEB WITH (NOLOC" + + "K) 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, "", "", "")); @@ -18266,6 +18316,7 @@ GROUP BY purchase_admin"; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@oversea", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", 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_PurchaseEB] SET [pdate] = @pdate, [state] = @state, [process] = @pr" + @@ -18282,68 +18333,70 @@ GROUP BY purchase_admin"; "chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin" + "] = @purchase_admin, [currency] = @currency, [conf_status] = @conf_status, [conf" + "_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_" + - "admin, [bigo_manager] = @bigo_manager, [site] = @site 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)) A" + - "ND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_proces" + - "s)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_r" + - "eceive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((" + - "@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) A" + - "ND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNul" + - "l_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_pum" + - "unit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_p" + - "umqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Ori" + - "ginal_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 ([sup" + - "plyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS" + - " NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [as" + - "set] 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 NUL" + - "L) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dep" + - "t] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wda" + - "te) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_impo" + - "rt)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pum" + - "idx)) 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_manupr" + - "oc)) 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 NU" + - "LL) 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_ch" + - "k1 = 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 A" + - "ND [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_pum" + - "qtyReq)) 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_pur" + - "chase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_p" + - "urchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency" + - "] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL" + - ") OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND" + - " [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@Is" + - "Null_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original" + - "_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo" + - "_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manage" + - "r] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1" + - " AND [site] IS NULL) OR ([site] = @Original_site)));\r\nSELECT idx, pdate, state, " + - "process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getU" + - "serName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumpri" + - "ce, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, de" + - "pt, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, i" + - "nqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pu" + - "mqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, con" + - "f_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WH" + - "ERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; + "admin, [bigo_manager] = @bigo_manager, [site] = @site, [oversea] = @oversea WHER" + + "E (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pda" + + "te] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state]" + + " = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([proce" + + "ss] = @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] = @Origi" + + "nal_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Orig" + + "inal_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale]" + + " = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pu" + + "munit] = @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 [supply" + + "idx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx =" + + " 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@Is" + + "Null_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNul" + + "l_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_i" + + "ndate = 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 [d" + + "ept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([" + + "wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([im" + + "port] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([p" + + "umidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([is" + + "del] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] =" + + " @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manupr" + + "oc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR (" + + "[orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_pl" + + "ace = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty" + + " = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumprice" + + "D = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@Is" + + "Null_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_wind" + + "ate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) A" + + "ND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@I" + + "sNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_cost" + + "center)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Or" + + "iginal_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumq" + + "tyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NU" + + "LL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 A" + + "ND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manag" + + "er)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchas" + + "e_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] " + + "IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND" + + " [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNul" + + "l_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_co" + + "nf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([con" + + "f_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_adm" + + "in] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manage" + + "r = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) " + + "AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@" + + "IsNull_oversea = 1 AND [oversea] IS NULL) OR ([oversea] = @Original_oversea)));\r" + + "\nSELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receive" + + "Name, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumsca" + + "le, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, a" + + "sset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manupro" + + "c, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk" + + "2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin," + + " currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, si" + + "te, oversea FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (idx = @idx) ORDER BY pdat" + + "e 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, "", "", "")); @@ -18397,6 +18450,7 @@ GROUP BY purchase_admin"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@oversea", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", 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, "", "", "")); @@ -18497,6 +18551,8 @@ GROUP BY purchase_admin"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_site", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_oversea", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_oversea", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "oversea", 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, "", "", "")); } @@ -18516,7 +18572,7 @@ GROUP BY purchase_admin"; 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, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager, site + bigo_manager, site, oversea FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -18543,13 +18599,7 @@ 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, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, 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, site, state, supply, supplyidx, wdate, windate, winuid, - wuid -FROM EETGW_PurchaseEB WITH (NOLOCK) -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') -ORDER BY pdate DESC, idx DESC"; + this._commandCollection[3].CommandText = @"SELECT asset, bigo, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, oversea, 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, site, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') 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("@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(); @@ -18557,7 +18607,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[4].CommandText = @"SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, 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, bigo_admin, bigo_manager, conf_status, conf_request, - conf_reponse + conf_reponse, oversea, site FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (idx = @idx)"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; @@ -18820,7 +18870,8 @@ ORDER BY pdate DESC, idx DESC"; string Original_conf_reponse, string Original_bigo_admin, string Original_bigo_manager, - string Original_site) { + string Original_site, + string Original_oversea) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -19219,6 +19270,14 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[98].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[99].Value = ((string)(Original_site)); } + if ((Original_oversea == null)) { + this.Adapter.DeleteCommand.Parameters[100].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[101].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[100].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[101].Value = ((string)(Original_oversea)); + } 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)) { @@ -19291,7 +19350,8 @@ ORDER BY pdate DESC, idx DESC"; string conf_reponse, string bigo_admin, string bigo_manager, - string site) { + string site, + string oversea) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -19599,6 +19659,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[51].Value = ((string)(site)); } + if ((oversea == null)) { + this.Adapter.InsertCommand.Parameters[52].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[52].Value = ((string)(oversea)); + } 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)) { @@ -19672,6 +19738,7 @@ ORDER BY pdate DESC, idx DESC"; string bigo_admin, string bigo_manager, string site, + string oversea, int Original_idx, string Original_pdate, string Original_state, @@ -19724,6 +19791,7 @@ ORDER BY pdate DESC, idx DESC"; string Original_bigo_admin, string Original_bigo_manager, string Original_site, + string Original_oversea, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -20032,405 +20100,419 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(site)); } - this.Adapter.UpdateCommand.Parameters[52].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + if ((oversea == null)) { + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(oversea)); + } + this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_idx)); + if ((Original_pdate == 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_pdate)); } if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_state)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_process)); } if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_receive)); } if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_sc)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_request)); } if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_sid)); } if ((Original_pumname == null)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_pumname)); } if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_pumscale)); } if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_pumunit)); } if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_pumqty.Value)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_pumqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[76].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((decimal)(Original_pumprice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[78].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((decimal)(Original_pumamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_supply)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[82].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[84].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((int)(Original_projectidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[86].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_asset)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[88].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_edate)); } if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[90].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[90].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_indate)); } if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[92].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[92].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((string)(Original_po)); } if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[94].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[95].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[95].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[95].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[96].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[97].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[98].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[99].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[98].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[99].Value = global::System.DBNull.Value; } if ((Original_pumidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[100].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[101].Value = ((int)(Original_pumidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[100].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[101].Value = global::System.DBNull.Value; } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[102].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[103].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[103].Value = global::System.DBNull.Value; } if ((Original_bigo == null)) { - this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[105].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_bigo)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[105].Value = ((string)(Original_bigo)); } if ((Original_manuproc == null)) { - this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[107].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[106].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[107].Value = ((string)(Original_manuproc)); } if ((Original_orderno == null)) { - this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[108].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[108].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[109].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[108].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[108].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[109].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[109].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[110].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[111].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[112].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[110].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[111].Value = ((string)(Original_place)); + this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[112].Value = ((string)(Original_place)); } if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[112].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[113].Value = ((int)(Original_inqty.Value)); + this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[114].Value = ((int)(Original_inqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[112].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[113].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[114].Value = global::System.DBNull.Value; } if ((Original_pumpriceD.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[114].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[115].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[116].Value = ((decimal)(Original_pumpriceD.Value)); } else { - this.Adapter.UpdateCommand.Parameters[114].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[115].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[116].Value = global::System.DBNull.Value; } if ((Original_inremark == null)) { - this.Adapter.UpdateCommand.Parameters[116].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[117].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[118].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[116].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[117].Value = ((string)(Original_inremark)); + this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[118].Value = ((string)(Original_inremark)); } if ((Original_winuid == null)) { - this.Adapter.UpdateCommand.Parameters[118].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[119].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[120].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[118].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[119].Value = ((string)(Original_winuid)); + this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[120].Value = ((string)(Original_winuid)); } if ((Original_windate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[120].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[121].Value = ((System.DateTime)(Original_windate.Value)); + this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[122].Value = ((System.DateTime)(Original_windate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[120].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[121].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[122].Value = global::System.DBNull.Value; } if ((Original_chk1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[122].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[123].Value = ((bool)(Original_chk1.Value)); + this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[124].Value = ((bool)(Original_chk1.Value)); } else { - this.Adapter.UpdateCommand.Parameters[122].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[123].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[124].Value = global::System.DBNull.Value; } if ((Original_chk2.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[124].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[125].Value = ((bool)(Original_chk2.Value)); + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[126].Value = ((bool)(Original_chk2.Value)); } else { - this.Adapter.UpdateCommand.Parameters[124].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[125].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[126].Value = global::System.DBNull.Value; } if ((Original_costcenter == null)) { - this.Adapter.UpdateCommand.Parameters[126].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[127].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[128].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[126].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[127].Value = ((string)(Original_costcenter)); + this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[128].Value = ((string)(Original_costcenter)); } if ((Original_linecode == null)) { - this.Adapter.UpdateCommand.Parameters[128].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[129].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[130].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[128].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[129].Value = ((string)(Original_linecode)); + this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[130].Value = ((string)(Original_linecode)); } if ((Original_pumqtyReq.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[130].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[131].Value = ((int)(Original_pumqtyReq.Value)); + this.Adapter.UpdateCommand.Parameters[131].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[132].Value = ((int)(Original_pumqtyReq.Value)); } else { - this.Adapter.UpdateCommand.Parameters[130].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[131].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[131].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[132].Value = global::System.DBNull.Value; } if ((Original_chkremark == null)) { - this.Adapter.UpdateCommand.Parameters[132].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[133].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[133].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[134].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[132].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[133].Value = ((string)(Original_chkremark)); + this.Adapter.UpdateCommand.Parameters[133].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[134].Value = ((string)(Original_chkremark)); } if ((Original_purchase_manager == null)) { - this.Adapter.UpdateCommand.Parameters[134].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[135].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[135].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[136].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[134].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[135].Value = ((string)(Original_purchase_manager)); + this.Adapter.UpdateCommand.Parameters[135].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[136].Value = ((string)(Original_purchase_manager)); } if ((Original_purchase_admin == null)) { - this.Adapter.UpdateCommand.Parameters[136].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[137].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[137].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[138].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[136].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[137].Value = ((string)(Original_purchase_admin)); + this.Adapter.UpdateCommand.Parameters[137].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[138].Value = ((string)(Original_purchase_admin)); } if ((Original_currency == null)) { - this.Adapter.UpdateCommand.Parameters[138].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[139].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[139].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[140].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[138].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[139].Value = ((string)(Original_currency)); + this.Adapter.UpdateCommand.Parameters[139].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[140].Value = ((string)(Original_currency)); } if ((Original_conf_status == null)) { - this.Adapter.UpdateCommand.Parameters[140].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[141].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[141].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[142].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[140].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[141].Value = ((string)(Original_conf_status)); + this.Adapter.UpdateCommand.Parameters[141].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[142].Value = ((string)(Original_conf_status)); } if ((Original_conf_request == null)) { - this.Adapter.UpdateCommand.Parameters[142].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[143].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[143].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[144].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[142].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[143].Value = ((string)(Original_conf_request)); + this.Adapter.UpdateCommand.Parameters[143].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[144].Value = ((string)(Original_conf_request)); } if ((Original_conf_reponse == null)) { - this.Adapter.UpdateCommand.Parameters[144].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[145].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[145].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[146].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[144].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[145].Value = ((string)(Original_conf_reponse)); + this.Adapter.UpdateCommand.Parameters[145].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[146].Value = ((string)(Original_conf_reponse)); } if ((Original_bigo_admin == null)) { - this.Adapter.UpdateCommand.Parameters[146].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[147].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[147].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[148].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[146].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[147].Value = ((string)(Original_bigo_admin)); + this.Adapter.UpdateCommand.Parameters[147].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[148].Value = ((string)(Original_bigo_admin)); } if ((Original_bigo_manager == null)) { - this.Adapter.UpdateCommand.Parameters[148].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[149].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[149].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[150].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[148].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[149].Value = ((string)(Original_bigo_manager)); + this.Adapter.UpdateCommand.Parameters[149].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[150].Value = ((string)(Original_bigo_manager)); } if ((Original_site == null)) { - this.Adapter.UpdateCommand.Parameters[150].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[151].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[151].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[152].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[150].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[151].Value = ((string)(Original_site)); + this.Adapter.UpdateCommand.Parameters[151].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[152].Value = ((string)(Original_site)); } - this.Adapter.UpdateCommand.Parameters[152].Value = ((int)(idx)); + if ((Original_oversea == null)) { + this.Adapter.UpdateCommand.Parameters[153].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[154].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[153].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[154].Value = ((string)(Original_oversea)); + } + this.Adapter.UpdateCommand.Parameters[155].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)) { @@ -20504,6 +20586,7 @@ ORDER BY pdate DESC, idx DESC"; string bigo_admin, string bigo_manager, string site, + string oversea, int Original_idx, string Original_pdate, string Original_state, @@ -20555,8 +20638,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_conf_reponse, string Original_bigo_admin, string Original_bigo_manager, - string Original_site) { - 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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site, 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_currency, Original_conf_status, Original_conf_request, Original_conf_reponse, Original_bigo_admin, Original_bigo_manager, Original_site, Original_idx); + string Original_site, + string Original_oversea) { + 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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site, oversea, 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_currency, Original_conf_status, Original_conf_request, Original_conf_reponse, Original_bigo_admin, Original_bigo_manager, Original_site, Original_oversea, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index b182c95..5fa4405 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -1143,7 +1143,7 @@ GROUP BY purchase_admin - DELETE FROM [EETGW_PurchaseEB] 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)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site))) + DELETE FROM [EETGW_PurchaseEB] 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)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_oversea = 1 AND [oversea] IS NULL) OR ([oversea] = @Original_oversea))) @@ -1245,13 +1245,15 @@ GROUP BY purchase_admin + + - INSERT INTO [EETGW_PurchaseEB] ([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], [currency], [conf_status], [conf_request], [conf_reponse], [bigo_admin], [bigo_manager], [site]) 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, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_manager, @site); -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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC + INSERT INTO [EETGW_PurchaseEB] ([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], [currency], [conf_status], [conf_request], [conf_reponse], [bigo_admin], [bigo_manager], [site], [oversea]) 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, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_manager, @site, @oversea); +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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site, oversea FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -1305,6 +1307,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + @@ -1313,7 +1316,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, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager, site + bigo_manager, site, oversea FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -1324,8 +1327,8 @@ ORDER BY pdate DESC, idx DESC - UPDATE [EETGW_PurchaseEB] 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, [currency] = @currency, [conf_status] = @conf_status, [conf_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_admin, [bigo_manager] = @bigo_manager, [site] = @site 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)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site))); -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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC + UPDATE [EETGW_PurchaseEB] 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, [currency] = @currency, [conf_status] = @conf_status, [conf_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_admin, [bigo_manager] = @bigo_manager, [site] = @site, [oversea] = @oversea 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)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_oversea = 1 AND [oversea] IS NULL) OR ([oversea] = @Original_oversea))); +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, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site, oversea FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -1379,6 +1382,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + @@ -1479,7 +1483,9 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN - + + + @@ -1541,6 +1547,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + @@ -1581,13 +1588,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT asset, bigo, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, 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, site, state, supply, supplyidx, wdate, windate, winuid, - wuid -FROM EETGW_PurchaseEB WITH (NOLOCK) -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') -ORDER BY pdate DESC, idx DESC + SELECT asset, bigo, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, oversea, 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, site, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') ORDER BY pdate DESC, idx DESC @@ -1600,7 +1601,7 @@ ORDER BY pdate DESC, idx DESC SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, 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, bigo_admin, bigo_manager, conf_status, conf_request, - conf_reponse + conf_reponse, oversea, site FROM EETGW_PurchaseEB WITH (NOLOCK) WHERE (idx = @idx) @@ -2259,14 +2260,14 @@ ORDER BY pdate DESC, idx DESC - + - + @@ -2773,6 +2774,13 @@ ORDER BY pdate DESC, idx DESC + + + + + + + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 40f8e0c..ecb2efc 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/SubProject/FEQ0000/dsPurchase.xss @@ -4,11 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs index 1aef023..5ee46a5 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs @@ -145,6 +145,12 @@ namespace FPJ0000.JobReport_ row.Add("--"); row.Add("비 프로젝트 업무"); } + else if (dr.Key == "미팅") + { + row.Add("--"); + row.Add("미팅"); + addholy = true; + } else if (dr.Key == "휴가") { row.Add("--"); @@ -186,7 +192,7 @@ namespace FPJ0000.JobReport_ row.Add(tperc); - if (string.IsNullOrEmpty(dr.Key)) + if (string.IsNullOrEmpty(dr.Key) || dr.Key == "휴가" || dr.Key == "미팅") dv1.Rows.Insert(0, row.ToArray()); else dv1.Rows.Add(row.ToArray()); @@ -226,28 +232,45 @@ namespace FPJ0000.JobReport_ } //첫줄은 색상을 변경해준다. - if (dv1.RowCount > 0) - { - var dvrow = dv1.Rows[0]; - for (int i = 0; i < this.dv1.ColumnCount; i++) - { - var c = dvrow.Cells[i]; - c.Style.BackColor = Color.LightGray; - } + //if (dv1.RowCount > 0) + //{ + // var dvrow = dv1.Rows[0]; + // for (int i = 0; i < this.dv1.ColumnCount; i++) + // { + // var c = dvrow.Cells[i]; + // c.Style.BackColor = Color.LightGray; + // } - } - if (addholy && dv1.RowCount > 1) + //} + for(int r = 0; r < dv1.RowCount;r++) { - var dvrow = dv1.Rows[1]; - for (int i = 0; i < this.dv1.ColumnCount; i++) + var dvrow = dv1.Rows[r]; + var idxvlaue = dvrow.Cells[0].Value.ToString(); + if (idxvlaue == "-1") { - var c = dvrow.Cells[i]; - c.Style.BackColor = Color.LightGray; + for (int i = 0; i < this.dv1.ColumnCount; i++) + { + var c = dvrow.Cells[i]; + c.Style.BackColor = Color.LightGray; + } } - + else break; + } + //if (addholy && dv1.RowCount > 1) + //{ + // var dvrow = dv1.Rows[1]; + // for (int i = 0; i < this.dv1.ColumnCount; i++) + // { + // var c = dvrow.Cells[i]; + // c.Style.BackColor = Color.LightGray; + // } + + //} + + this.dv1.AutoResizeColumns(); } diff --git a/SubProject/FPJ0000/Properties/Settings.Designer.cs b/SubProject/FPJ0000/Properties/Settings.Designer.cs index 1979ed0..9184a08 100644 --- a/SubProject/FPJ0000/Properties/Settings.Designer.cs +++ b/SubProject/FPJ0000/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FPJ0000.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -27,7 +27,7 @@ namespace FPJ0000.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string gwcs { get { return ((string)(this["gwcs"])); @@ -38,7 +38,7 @@ namespace FPJ0000.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string EEEntities { get { return ((string)(this["EEEntities"])); @@ -49,7 +49,7 @@ namespace FPJ0000.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" + - "user;Password=Amkor123!")] + "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")] public string EEEntitiesLayout { get { return ((string)(this["EEEntitiesLayout"])); diff --git a/SubProject/FPJ0000/Properties/Settings.settings b/SubProject/FPJ0000/Properties/Settings.settings index 7b27cd0..2b56206 100644 --- a/SubProject/FPJ0000/Properties/Settings.settings +++ b/SubProject/FPJ0000/Properties/Settings.settings @@ -4,26 +4,26 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True \ No newline at end of file diff --git a/SubProject/FPJ0000/app.config b/SubProject/FPJ0000/app.config index ae79465..64dc96a 100644 --- a/SubProject/FPJ0000/app.config +++ b/SubProject/FPJ0000/app.config @@ -5,12 +5,17 @@ - - - - - - + + + + + + diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index 686c3a9..bce2130 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -9040,12 +9040,13 @@ ORDER BY pdate"; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, - Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName + Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)) + AS PrjName FROM JobReport WITH (nolock) LEFT OUTER JOIN Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0) -GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), - Projects.status +GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, + (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status ORDER BY title, ww"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].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, "", "", "")); diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index c479635..5a0f6d6 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -300,12 +300,13 @@ ORDER BY pdate SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, - Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName + Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)) + AS PrjName FROM JobReport WITH (nolock) LEFT OUTER JOIN Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0) -GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), - Projects.status +GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, + (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status ORDER BY title, ww diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index 0522d56..767a3d6 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +