This commit is contained in:
chi
2023-10-18 13:09:25 +09:00
parent 036244651b
commit 06b0699bf7
8 changed files with 489 additions and 386 deletions

View File

@@ -2798,6 +2798,8 @@ namespace FEQ0000 {
private global::System.Data.DataColumn columnpurchase_admin;
private global::System.Data.DataColumn columnplace;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public IpkolistDataTable() {
@@ -3023,6 +3025,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 placeColumn {
get {
return this.columnplace;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3084,7 +3094,8 @@ namespace FEQ0000 {
string orderno,
int sortkey,
string purchase_manager,
string purchase_admin) {
string purchase_admin,
string place) {
IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
source,
@@ -3110,7 +3121,8 @@ namespace FEQ0000 {
orderno,
sortkey,
purchase_manager,
purchase_admin};
purchase_admin,
place};
rowIpkolistRow.ItemArray = columnValuesArray;
this.Rows.Add(rowIpkolistRow);
return rowIpkolistRow;
@@ -3165,6 +3177,7 @@ namespace FEQ0000 {
this.columnsortkey = base.Columns["sortkey"];
this.columnpurchase_manager = base.Columns["purchase_manager"];
this.columnpurchase_admin = base.Columns["purchase_admin"];
this.columnplace = base.Columns["place"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3218,6 +3231,8 @@ namespace FEQ0000 {
base.Columns.Add(this.columnpurchase_manager);
this.columnpurchase_admin = new global::System.Data.DataColumn("purchase_admin", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnpurchase_admin);
this.columnplace = new global::System.Data.DataColumn("place", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnplace);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnsource,
this.columnidx}, true));
@@ -3261,6 +3276,8 @@ namespace FEQ0000 {
this.columnpurchase_manager.MaxLength = 50;
this.columnpurchase_admin.ReadOnly = true;
this.columnpurchase_admin.MaxLength = 50;
this.columnplace.ReadOnly = true;
this.columnplace.MaxLength = 20;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7258,6 +7275,22 @@ namespace FEQ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string place {
get {
if (this.IsplaceNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableIpkolist.placeColumn]));
}
}
set {
this[this.tableIpkolist.placeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IspdateNull() {
@@ -7521,6 +7554,18 @@ namespace FEQ0000 {
public void Setpurchase_adminNull() {
this[this.tableIpkolist.purchase_adminColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsplaceNull() {
return this.IsNull(this.tableIpkolist.placeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetplaceNull() {
this[this.tableIpkolist.placeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -13380,6 +13425,7 @@ ORDER BY pdate DESC, idx DESC";
tableMapping.ColumnMappings.Add("sortkey", "sortkey");
tableMapping.ColumnMappings.Add("purchase_manager", "purchase_manager");
tableMapping.ColumnMappings.Add("purchase_admin", "purchase_admin");
tableMapping.ColumnMappings.Add("place", "place");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -13397,13 +13443,13 @@ ORDER BY pdate DESC, idx DESC";
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
FROM Purchase
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND
(ISNULL(purchase_admin, '') LIKE @search_admin)
UNION
SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
FROM EETGW_PurchaseCR
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND
(ISNULL(purchase_admin, '') LIKE @search_admin)
@@ -13416,13 +13462,13 @@ ORDER BY sortkey, wdate DESC";
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
FROM Purchase
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '')
LIKE @search_admin)
UNION
SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
FROM EETGW_PurchaseCR
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '')
LIKE @search_admin)