This commit is contained in:
chi
2020-09-03 20:44:39 +09:00
parent d88b1e1909
commit 31941ae90f
54 changed files with 4184 additions and 1604 deletions

View File

@@ -114,6 +114,9 @@
<DesignTime>True</DesignTime>
<DependentUpon>DSMail.xsd</DependentUpon>
</Compile>
<Compile Include="dsMSSQL.cs">
<DependentUpon>dsMSSQL.xsd</DependentUpon>
</Compile>
<Compile Include="DSPMP.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory />
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>ko-KR</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
</Project>

View File

@@ -1005,7 +1005,7 @@ namespace FCM0000 {
this.columncate.MaxLength = 50;
this.columnscale.DefaultValue = ((double)(1D));
this.columnunit.DefaultValue = ((string)("EA"));
this.columnunit.MaxLength = 10;
this.columnunit.MaxLength = 50;
this.columnimport.MaxLength = 1;
this.columngcode.MaxLength = 10;
}
@@ -9803,7 +9803,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9823,7 +9823,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" +
@@ -9898,6 +9898,17 @@ ORDER BY name, idx";
this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[9].Connection = this.Connection;
this._commandCollection[9].CommandText = "UPDATE Items\r\nSET name = @name, model = @model, unit = @unit, disable = @d" +
"isable\r\nWHERE (gcode = @gcode) AND (sid = @Original_sid)";
this._commandCollection[9].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10602,6 +10613,64 @@ ORDER BY name, idx";
return new global::System.Nullable<int>(((int)(returnValue)));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int UpdateMatrial(string name, string model, string unit, global::System.Nullable<bool> disable, string gcode, string Original_sid) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9];
if ((name == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
}
else {
command.Parameters[0].Value = ((string)(name));
}
if ((model == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
else {
command.Parameters[1].Value = ((string)(model));
}
if ((unit == null)) {
command.Parameters[2].Value = global::System.DBNull.Value;
}
else {
command.Parameters[2].Value = ((string)(unit));
}
if ((disable.HasValue == true)) {
command.Parameters[3].Value = ((bool)(disable.Value));
}
else {
command.Parameters[3].Value = global::System.DBNull.Value;
}
if ((gcode == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
command.Parameters[4].Value = ((string)(gcode));
}
if ((Original_sid == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
}
else {
command.Parameters[5].Value = ((string)(Original_sid));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
command.Connection.Open();
}
int returnValue;
try {
returnValue = command.ExecuteNonQuery();
}
finally {
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
command.Connection.Close();
}
}
return returnValue;
}
}
/// <summary>

View File

@@ -0,0 +1,15 @@
namespace FCM0000
{
partial class dsMSSQL
{
}
}
namespace FCM0000.dsMSSQLTableAdapters {
public partial class ItemsTableAdapter {
}
}

View File

@@ -76,7 +76,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
<Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="GroupWare.dbo.Items" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="supplyidx" ColumnName="supplyidx" DataSourceName="GroupWare.dbo.Items" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@supplyidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="supplyidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="scale" ColumnName="scale" DataSourceName="GroupWare.dbo.Items" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@scale" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="scale" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="unit" ColumnName="unit" DataSourceName="GroupWare.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@unit" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="unit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="unit" ColumnName="unit" DataSourceName="GroupWare.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@unit" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="unit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="disable" ColumnName="disable" DataSourceName="GroupWare.dbo.Items" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@disable" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="disable" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bparam1" ColumnName="bparam1" DataSourceName="GroupWare.dbo.Items" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bparam1" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bparam1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="iparam1" ColumnName="iparam1" DataSourceName="GroupWare.dbo.Items" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@iparam1" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="iparam1" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -144,7 +144,7 @@ where gcode = @gcode and isnull(replace(name,' ','') + replace(model,' ',''),'')
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ExistSID" Modifier="Public" Name="ExistSID" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="ExistSID">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ExistSID" Modifier="Public" Name="ExistSID" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="ExistSID">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT COUNT(*) FROM Items
@@ -213,7 +213,7 @@ ORDER BY name, idx</CommandText>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ReadIDX" Modifier="Public" Name="ReadIDX" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="ReadIDX">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ReadIDX" Modifier="Public" Name="ReadIDX" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="ReadIDX">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT ISNULL(idx, - 1) AS Expr1
@@ -227,6 +227,52 @@ WHERE (gcode = @gcode) AND (ISNULL(name, N'') = @name) AND (ISNULL(model, N'')
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Items" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="UpdateMatrial" Modifier="Public" Name="UpdateMatrial" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="UpdateMatrial">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE Items
SET name = @name, model = @model, unit = @unit, disable = @disable
WHERE (gcode = @gcode) AND (sid = @Original_sid)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="EE.dbo.Items" DataTypeServer="nvarchar(200)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="200" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="EE.dbo.Items" DataTypeServer="nvarchar(200)" DbType="String" Direction="Input" ParameterName="@model" Precision="0" ProviderType="NVarChar" Scale="0" Size="200" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="unit" ColumnName="unit" DataSourceName="EE.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@unit" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="unit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="disable" ColumnName="disable" DataSourceName="EE.dbo.Items" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@disable" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="disable" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_sid" ColumnName="sid" DataSourceName="EE.dbo.Items" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@Original_sid" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sid" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE Items
SET name = @name, model = @model,unit = @unit, disable = @disable
WHERE (gcode = @gcode,sid= @Original_sid);</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="" DataTypeServer="nvarchar(200)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="200" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sid" ColumnName="sid" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sid" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="" DataTypeServer="nvarchar(200)" DbType="String" Direction="Input" ParameterName="@model" Precision="0" ProviderType="NVarChar" Scale="0" Size="200" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="manu" ColumnName="manu" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@manu" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="manu" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="supply" ColumnName="supply" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@supply" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="supply" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="price" ColumnName="price" DataSourceName="" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@price" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="price" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="supplyidx" ColumnName="supplyidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@supplyidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="supplyidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="scale" ColumnName="scale" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@scale" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="scale" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="unit" ColumnName="unit" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@unit" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="unit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="disable" ColumnName="disable" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@disable" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="disable" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bparam1" ColumnName="bparam1" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bparam1" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bparam1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="iparam1" ColumnName="iparam1" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@iparam1" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="iparam1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="char(1)" DbType="AnsiString" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Char" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="CommonTableAdapter" GeneratorDataComponentClassName="CommonTableAdapter" Name="Common" UserDataComponentName="CommonTableAdapter">
@@ -1435,7 +1481,7 @@ ORDER BY pdate</CommandText>
<xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1502,7 +1548,7 @@ ORDER BY pdate</CommandText>
<xs:element name="unit" msprop:nullValue="EA" msprop:Generator_ColumnPropNameInRow="unit" msprop:Generator_ColumnVarNameInTable="columnunit" msprop:Generator_ColumnPropNameInTable="unitColumn" msprop:Generator_UserColumnName="unit" default="EA" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1526,7 +1572,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowClassName="CommonRow" msprop:Generator_UserTableName="Common" msprop:Generator_RowEvArgName="CommonRowChangeEvent">
<xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_UserTableName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_RowClassName="CommonRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1578,7 +1624,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_RowClassName="BoardRow" msprop:Generator_UserTableName="Board" msprop:Generator_RowEvArgName="BoardRowChangeEvent">
<xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_UserTableName="Board" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_RowEvArgName="BoardRowChangeEvent" msprop:Generator_RowClassName="BoardRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1646,7 +1692,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_RowClassName="RequestItemRow" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent">
<xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent" msprop:Generator_RowClassName="RequestItemRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1735,7 +1781,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_RowClassName="CustomsRow" msprop:Generator_UserTableName="Customs" msprop:Generator_RowEvArgName="CustomsRowChangeEvent">
<xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_UserTableName="Customs" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_RowEvArgName="CustomsRowChangeEvent" msprop:Generator_RowClassName="CustomsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1848,7 +1894,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_RowClassName="StaffRow" msprop:Generator_UserTableName="Staff" msprop:Generator_RowEvArgName="StaffRowChangeEvent">
<xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_UserTableName="Staff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_RowEvArgName="StaffRowChangeEvent" msprop:Generator_RowClassName="StaffRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1913,7 +1959,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2054,7 +2100,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ddate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ddate" msprop:Generator_ColumnVarNameInTable="columnddate" msprop:Generator_ColumnPropNameInTable="ddateColumn" msprop:Generator_UserColumnName="ddate" minOccurs="0">
@@ -2153,7 +2199,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2183,7 +2229,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent" msprop:Generator_RowClassName="InventoryUserRow">
<xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_RowClassName="InventoryUserRow" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />

View File

@@ -6,8 +6,8 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-12" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Items" ZOrder="10" X="48" Y="30" Height="647" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="387" />
<Shape ID="DesignTable:Common" ZOrder="9" X="431" Y="70" Height="267" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Items" ZOrder="10" X="48" Y="30" Height="647" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="387" />
<Shape ID="DesignTable:Common" ZOrder="9" X="245" Y="33" Height="267" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Board" ZOrder="8" X="982" Y="70" Height="305" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:RequestItem" ZOrder="7" X="1499" Y="70" Height="324" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Customs" ZOrder="6" X="1788" Y="70" Height="362" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

View File

@@ -219,6 +219,8 @@ namespace FCM0000
int err = 0;
//12,13
var dtTarget = new dsMSSQL.ItemsDataTable();
try
{
var sheet = book.getSheet((int)nudSheetNo.Value);
@@ -226,14 +228,16 @@ namespace FCM0000
var MaxRow = (int)nudE.Value;
for (int r = MinRow; r <= MaxRow; r++)
{
cnt += 1;
if (this.progressBar1.Value < this.progressBar1.Maximum)
this.progressBar1.Value += 1;
//화면 업데이트
this.Text = string.Format("{0}/{1} : {2:N2}% 추가:{3},오류:{4},넘김:{5}", progressBar1.Value, progressBar1.Maximum, ((progressBar1.Value * 1.0) / progressBar1.Maximum) * 100.0,add,err,dup);
this.Text = string.Format("{0}/{1} : {2:N2}% 추가:{3},오류:{4},넘김:{5}", r, MaxRow, ((progressBar1.Value * 1.0) / progressBar1.Maximum) * 100.0,add,err,dup);
Application.DoEvents();
//if(cnt % 10 == 0)
Application.DoEvents();
var v_sid = sheet.readStr(r, 0);
v_sid = v_sid.Replace("_", "").Replace("-", "").Replace(" ", "").Replace(".", "");
@@ -263,7 +267,11 @@ namespace FCM0000
//중복은 처리하지 않는다.
if (ta.ExistSID("EET1P", v_sid) > 0)
{
dup += 1;
//해당 sid데이터가 잇으므로 업데이트를 한다
Boolean disable = v_del == "X" ? true : false;
dup += ta.UpdateMatrial(v_name, v_model, v_cate, disable, "EET1P", v_sid);
// dup += 1;
continue;
}
@@ -299,9 +307,11 @@ namespace FCM0000
newdr.wdate = DateTime.Now;
//newdr.unit = "--";
newdr.import = textBox2.Text;
ta.Update(newdr);
newdr.Delete();
add += 1;
dt.Rows.Add(newdr);
add += ta.Update(newdr);
newdr.Delete();
dtTarget.AcceptChanges();
//add += 1;
}
catch (Exception ex)
{
@@ -309,7 +319,7 @@ namespace FCM0000
}
Application.DoEvents();
//Application.DoEvents();