This commit is contained in:
chi
2023-10-08 00:04:31 +09:00
parent 37f2fdf053
commit b6291f2bd0
32 changed files with 1610 additions and 691 deletions

View File

@@ -39,6 +39,7 @@ namespace FCM0000 {
base.Tables.CollectionChanged += schemaChangedHandler;
base.Relations.CollectionChanged += schemaChangedHandler;
this.EndInit();
this.InitExpressions();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -50,6 +51,9 @@ namespace FCM0000 {
global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
this.Tables.CollectionChanged += schemaChangedHandler1;
this.Relations.CollectionChanged += schemaChangedHandler1;
if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) {
this.InitExpressions();
}
return;
}
string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string))));
@@ -73,6 +77,7 @@ namespace FCM0000 {
}
else {
this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
this.InitExpressions();
}
this.GetSerializationData(info, context);
global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
@@ -144,6 +149,7 @@ namespace FCM0000 {
public override global::System.Data.DataSet Clone() {
DSInventory cln = ((DSInventory)(base.Clone()));
cln.InitVars();
cln.InitExpressions();
cln.SchemaSerializationMode = this.SchemaSerializationMode;
return cln;
}
@@ -230,7 +236,7 @@ namespace FCM0000 {
this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
this.tableInventory = new InventoryDataTable();
base.Tables.Add(this.tableInventory);
this.tablevInventory = new vInventoryDataTable();
this.tablevInventory = new vInventoryDataTable(false);
base.Tables.Add(this.tablevInventory);
}
@@ -301,6 +307,12 @@ namespace FCM0000 {
return type;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitExpressions() {
this.vInventory.placeboxColumn.Expression = "place + \'_\' + box";
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public delegate void InventoryRowChangeEventHandler(object sender, InventoryRowChangeEvent e);
@@ -922,12 +934,23 @@ namespace FCM0000 {
private global::System.Data.DataColumn columnbox;
private global::System.Data.DataColumn columnplacebox;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public vInventoryDataTable() {
public vInventoryDataTable() :
this(false) {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public vInventoryDataTable(bool initExpressions) {
this.TableName = "vInventory";
this.BeginInit();
this.InitClass();
if ((initExpressions == true)) {
this.InitExpressions();
}
this.EndInit();
}
@@ -1131,6 +1154,14 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn placeboxColumn {
get {
return this.columnplacebox;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1166,6 +1197,61 @@ namespace FCM0000 {
this.Rows.Add(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public vInventoryRow AddvInventoryRow(
string gcode,
string pdate,
string invtype,
string uid,
string userName,
int item,
string serial,
int dr_qty,
decimal dr_amt,
int cr_qty,
decimal cr_amt,
string place,
string memo,
string itemName,
string itemModel,
int project,
string projectName,
string wuid,
System.DateTime wdate,
string sid,
string box,
string placebox) {
vInventoryRow rowvInventoryRow = ((vInventoryRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
gcode,
pdate,
invtype,
uid,
userName,
item,
serial,
dr_qty,
dr_amt,
cr_qty,
cr_amt,
place,
memo,
itemName,
itemModel,
project,
projectName,
wuid,
wdate,
sid,
box,
placebox};
rowvInventoryRow.ItemArray = columnValuesArray;
this.Rows.Add(rowvInventoryRow);
return rowvInventoryRow;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public vInventoryRow AddvInventoryRow(
@@ -1213,7 +1299,8 @@ namespace FCM0000 {
wuid,
wdate,
sid,
box};
box,
null};
rowvInventoryRow.ItemArray = columnValuesArray;
this.Rows.Add(rowvInventoryRow);
return rowvInventoryRow;
@@ -1265,6 +1352,7 @@ namespace FCM0000 {
this.columnwdate = base.Columns["wdate"];
this.columnsid = base.Columns["sid"];
this.columnbox = base.Columns["box"];
this.columnplacebox = base.Columns["placebox"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1314,6 +1402,8 @@ namespace FCM0000 {
base.Columns.Add(this.columnsid);
this.columnbox = new global::System.Data.DataColumn("box", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbox);
this.columnplacebox = new global::System.Data.DataColumn("placebox", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnplacebox);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1338,6 +1428,7 @@ namespace FCM0000 {
this.columnwdate.AllowDBNull = false;
this.columnsid.MaxLength = 50;
this.columnbox.MaxLength = 100;
this.columnplacebox.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1358,6 +1449,12 @@ namespace FCM0000 {
return typeof(vInventoryRow);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitExpressions() {
this.placeboxColumn.Expression = "place + \'_\' + box";
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
@@ -2317,6 +2414,22 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string placebox {
get {
if (this.IsplaceboxNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablevInventory.placeboxColumn]));
}
}
set {
this[this.tablevInventory.placeboxColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IspdateNull() {
@@ -2532,6 +2645,18 @@ namespace FCM0000 {
public void SetboxNull() {
this[this.tablevInventory.boxColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsplaceboxNull() {
return this.IsNull(this.tablevInventory.placeboxColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetplaceboxNull() {
this[this.tablevInventory.placeboxColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -4143,7 +4268,7 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(place));
}
DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable();
DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable(true);
this.Adapter.Fill(dataTable);
return dataTable;
}