This commit is contained in:
chi
2023-04-28 16:13:40 +09:00
parent 79ea4ddfff
commit 354c6a5e1b
13 changed files with 459 additions and 283 deletions

View File

@@ -2404,6 +2404,8 @@ namespace FEQ0000 {
private global::System.Data.DataColumn columnorderno;
private global::System.Data.DataColumn columnsortkey;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public IpkolistDataTable() {
@@ -2605,6 +2607,14 @@ namespace FEQ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn sortkeyColumn {
get {
return this.columnsortkey;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2663,7 +2673,8 @@ namespace FEQ0000 {
string receive,
string sc,
string po,
string orderno) {
string orderno,
int sortkey) {
IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
source,
@@ -2686,7 +2697,8 @@ namespace FEQ0000 {
receive,
sc,
po,
orderno};
orderno,
sortkey};
rowIpkolistRow.ItemArray = columnValuesArray;
this.Rows.Add(rowIpkolistRow);
return rowIpkolistRow;
@@ -2738,6 +2750,7 @@ namespace FEQ0000 {
this.columnsc = base.Columns["sc"];
this.columnpo = base.Columns["po"];
this.columnorderno = base.Columns["orderno"];
this.columnsortkey = base.Columns["sortkey"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2785,6 +2798,8 @@ namespace FEQ0000 {
base.Columns.Add(this.columnpo);
this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnorderno);
this.columnsortkey = new global::System.Data.DataColumn("sortkey", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsortkey);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnsource,
this.columnidx}, true));
@@ -2823,6 +2838,7 @@ namespace FEQ0000 {
this.columnpo.MaxLength = 50;
this.columnorderno.ReadOnly = true;
this.columnorderno.MaxLength = 50;
this.columnsortkey.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3507,11 +3523,11 @@ namespace FEQ0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int inqty {
get {
try {
return ((int)(this[this.tablePurchase.inqtyColumn]));
if (this.IsinqtyNull()) {
return 0;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'inqty\' 열의 값이 DBNull입니다.", e);
else {
return ((int)(this[this.tablePurchase.inqtyColumn]));
}
}
set {
@@ -5403,11 +5419,11 @@ namespace FEQ0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int inqty {
get {
try {
return ((int)(this[this.tableIpkolist.inqtyColumn]));
if (this.IsinqtyNull()) {
return 0;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'inqty\' 열의 값이 DBNull입니다.", e);
else {
return ((int)(this[this.tableIpkolist.inqtyColumn]));
}
}
set {
@@ -5479,6 +5495,22 @@ namespace FEQ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int sortkey {
get {
try {
return ((int)(this[this.tableIpkolist.sortkeyColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'sortkey\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableIpkolist.sortkeyColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IspdateNull() {
@@ -5706,6 +5738,18 @@ namespace FEQ0000 {
public void SetordernoNull() {
this[this.tableIpkolist.ordernoColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IssortkeyNull() {
return this.IsNull(this.tableIpkolist.sortkeyColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetsortkeyNull() {
this[this.tableIpkolist.sortkeyColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -10158,6 +10202,7 @@ ORDER BY pdate DESC, idx DESC";
tableMapping.ColumnMappings.Add("sc", "sc");
tableMapping.ColumnMappings.Add("po", "po");
tableMapping.ColumnMappings.Add("orderno", "orderno");
tableMapping.ColumnMappings.Add("sortkey", "sortkey");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -10175,33 +10220,33 @@ 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
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey
FROM Purchase
WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
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
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey
FROM EETGW_PurchaseCR
WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY state, wdate DESC";
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY sortkey, wdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey
FROM Purchase
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
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
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey
FROM EETGW_PurchaseCR
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY source DESC, request, wdate DESC";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10259,7 +10304,7 @@ ORDER BY source DESC, request, wdate DESC";
public virtual int FillByTodayIn(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((pdate == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("pdate");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate));
@@ -10284,7 +10329,7 @@ ORDER BY source DESC, request, wdate DESC";
public virtual dsPurchase.IpkolistDataTable GetByTodayIn(string pdate, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((pdate == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("pdate");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate));