업무일지 입력창을 rtf 로 변경

This commit is contained in:
chi
2020-05-19 10:43:16 +09:00
parent 0daf284264
commit 117d7a3ba2
24 changed files with 9614 additions and 9364 deletions

View File

@@ -2940,6 +2940,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columngcode;
private global::System.Data.DataColumn columndescription2;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportDataTable() {
@@ -3141,6 +3143,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn description2Column {
get {
return this.columndescription2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3198,7 +3208,8 @@ namespace FPJ0000 {
double ot,
string ww,
string process,
string gcode) {
string gcode,
string description2) {
JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -3221,7 +3232,8 @@ namespace FPJ0000 {
ot,
ww,
process,
gcode};
gcode,
description2};
rowJobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportRow);
return rowJobReportRow;
@@ -3272,6 +3284,7 @@ namespace FPJ0000 {
this.columnww = base.Columns["ww"];
this.columnprocess = base.Columns["process"];
this.columngcode = base.Columns["gcode"];
this.columndescription2 = base.Columns["description2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3319,6 +3332,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnprocess);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.columndescription2 = new global::System.Data.DataColumn("description2", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columndescription2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -3344,7 +3359,9 @@ namespace FPJ0000 {
this.columnww.ReadOnly = true;
this.columnww.MaxLength = 6;
this.columnprocess.MaxLength = 50;
this.columngcode.AllowDBNull = false;
this.columngcode.MaxLength = 10;
this.columndescription2.MaxLength = 2147483647;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7248,18 +7265,29 @@ namespace FPJ0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string gcode {
get {
if (this.IsgcodeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReport.gcodeColumn]));
}
return ((string)(this[this.tableJobReport.gcodeColumn]));
}
set {
this[this.tableJobReport.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string description2 {
get {
if (this.Isdescription2Null()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReport.description2Column]));
}
}
set {
this[this.tableJobReport.description2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IspdateNull() {
@@ -7466,14 +7494,14 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableJobReport.gcodeColumn);
public bool Isdescription2Null() {
return this.IsNull(this.tableJobReport.description2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetgcodeNull() {
this[this.tableJobReport.gcodeColumn] = global::System.Convert.DBNull;
public void Setdescription2Null() {
this[this.tableJobReport.description2Column] = global::System.Convert.DBNull;
}
}
@@ -11819,6 +11847,7 @@ ORDER BY Project, no, ItemGroup, option1, ItemName";
tableMapping.ColumnMappings.Add("ww", "ww");
tableMapping.ColumnMappings.Add("process", "process");
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("description2", "description2");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -11856,8 +11885,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName";
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO JobReport
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode);
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2);
SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -11872,17 +11901,18 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", 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 JobReport
SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs,
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process
WHERE (idx = @Original_idx);
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2
WHERE (idx = @Original_idx);
SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -11897,10 +11927,11 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", 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, 4, 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
@@ -11919,7 +11950,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,
process, gcode
process, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
ORDER BY pdate DESC";
@@ -11940,7 +11971,7 @@ ORDER BY pdate DESC";
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
AS ww, gcode
AS ww, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
ORDER BY pdate DESC";
@@ -11987,7 +12018,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12024,7 +12055,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12059,7 +12090,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12096,7 +12127,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12119,7 +12150,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
@@ -12144,7 +12175,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
@@ -12353,7 +12384,8 @@ ORDER BY projectName";
string projectName,
global::System.Nullable<double> ot,
string process,
string gcode) {
string gcode,
string description2) {
if ((pidx.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value));
}
@@ -12446,11 +12478,17 @@ ORDER BY projectName";
this.Adapter.InsertCommand.Parameters[15].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.InsertCommand.Parameters[16].Value = ((string)(gcode));
}
if ((description2 == null)) {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[17].Value = ((string)(description2));
}
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)) {
@@ -12488,6 +12526,7 @@ ORDER BY projectName";
string projectName,
global::System.Nullable<double> ot,
string process,
string description2,
int Original_idx,
int idx) {
if ((pidx.HasValue == true)) {
@@ -12581,8 +12620,14 @@ ORDER BY projectName";
else {
this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(process));
}
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idx));
if ((description2 == null)) {
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(description2));
}
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[18].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)) {
@@ -12623,7 +12668,7 @@ ORDER BY projectName";
command.Parameters[2].Value = ((string)(user));
}
if ((gcode == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
command.Parameters[3].Value = ((string)(gcode));