문자편집기 창 별도 추가했음,

휴가내역 정렬 수정
This commit is contained in:
chi
2020-06-05 13:10:14 +09:00
parent a844e35d0b
commit bd442b73a8
20 changed files with 2697 additions and 1198 deletions

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("20.06.05.1030")]
[assembly: AssemblyFileVersion("20.06.05.1030")]
[assembly: AssemblyVersion("20.06.05.1240")]
[assembly: AssemblyFileVersion("20.06.05.1240")]

View File

@@ -31,6 +31,7 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FBS0000.dsMSSQL();
@@ -400,6 +401,7 @@
//
this.termDataGridViewTextBoxColumn.DataPropertyName = "term";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Red;
this.termDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
this.termDataGridViewTextBoxColumn.HeaderText = "사용";
this.termDataGridViewTextBoxColumn.Name = "termDataGridViewTextBoxColumn";
@@ -408,6 +410,9 @@
// termDr
//
this.termDr.DataPropertyName = "termDr";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Blue;
this.termDr.DefaultCellStyle = dataGridViewCellStyle2;
this.termDr.HeaderText = "발생";
this.termDr.Name = "termDr";
this.termDr.ReadOnly = true;

View File

@@ -103,10 +103,13 @@ namespace FBS0000
//잔량계산
double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr);
double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr); //전체발생수량
double sumdrN = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate == "10").Sum(t => t.termDr); //일반발생
double sumdrE = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate != "10").Sum(t => t.termDr); //기타발생
double sumcr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term);
double jan = sumdr - sumcr;
sbGen.Text = sumdr.ToString("N0");
sbGen.Text = string.Format("{0}+{1}",sumdrN, sumdrE);
sbUse.Text = sumcr.ToString("N0");
sbJan.Text = jan.ToString("N0");
if (jan < 0) sbJan.ForeColor = Color.Red;
@@ -159,7 +162,7 @@ namespace FBS0000
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMSSQL.vHoliday_uselistRow;
if(dr.cate == "0")
if(dr.cate == "10" || dr.cate=="11")
{
var f = new fHolyday_Add(dr.idx);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)

View File

@@ -42,6 +42,8 @@
this.cmbUser = new System.Windows.Forms.ComboBox();
this.btOK = new System.Windows.Forms.Button();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.radNormall = new System.Windows.Forms.RadioButton();
this.radEtc = new System.Windows.Forms.RadioButton();
sdateLabel = new System.Windows.Forms.Label();
contentsLabel = new System.Windows.Forms.Label();
uidLabel = new System.Windows.Forms.Label();
@@ -135,7 +137,7 @@
this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true));
this.dateTimePicker1.Location = new System.Drawing.Point(87, 45);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(422, 27);
this.dateTimePicker1.Size = new System.Drawing.Size(300, 27);
this.dateTimePicker1.TabIndex = 3;
this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
//
@@ -174,11 +176,35 @@
this.numericUpDown1.TabIndex = 7;
this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// radNormall
//
this.radNormall.AutoSize = true;
this.radNormall.Checked = true;
this.radNormall.Location = new System.Drawing.Point(393, 47);
this.radNormall.Name = "radNormall";
this.radNormall.Size = new System.Drawing.Size(55, 23);
this.radNormall.TabIndex = 9;
this.radNormall.TabStop = true;
this.radNormall.Text = "일반";
this.radNormall.UseVisualStyleBackColor = true;
//
// radEtc
//
this.radEtc.AutoSize = true;
this.radEtc.Location = new System.Drawing.Point(454, 47);
this.radEtc.Name = "radEtc";
this.radEtc.Size = new System.Drawing.Size(55, 23);
this.radEtc.TabIndex = 10;
this.radEtc.Text = "기타";
this.radEtc.UseVisualStyleBackColor = true;
//
// fHolyday_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(523, 340);
this.Controls.Add(this.radEtc);
this.Controls.Add(this.radNormall);
this.Controls.Add(this.numericUpDown1);
this.Controls.Add(label1);
this.Controls.Add(this.btOK);
@@ -192,7 +218,7 @@
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MinimizeBox = false;
this.Name = "fHolyday_Add";
this.Text = "휴가 등록";
this.Text = "휴가 발생 등록";
this.TopMost = true;
this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
@@ -214,5 +240,7 @@
private System.Windows.Forms.ComboBox cmbUser;
private System.Windows.Forms.Button btOK;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.RadioButton radNormall;
private System.Windows.Forms.RadioButton radEtc;
}
}

View File

@@ -34,6 +34,8 @@ namespace FBS0000
{
ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx);
this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow;
if (dr.cate == "10") radNormall.Checked = true;
else radEtc.Checked = true;
}
this.cmbUser.DataSource = FCOMMON.DBM.getUserTable();
@@ -53,9 +55,9 @@ namespace FBS0000
private void btOK_Click(object sender, EventArgs e)
{
if (radEtc.Checked) dr.cate = "11"; //OT년차발생
else dr.cate = "10";//일반 년차발생
//기본값처리
this.Validate();
this.bs.EndEdit();
this.dr.EndEdit();

File diff suppressed because it is too large Load Diff

View File

@@ -456,7 +456,7 @@ WHERE gcode = @gcode and idx =@idx
<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="minutes" msprop:Generator_TableClassName="minutesDataTable" msprop:Generator_TableVarName="tableminutes" msprop:Generator_TablePropName="minutes" msprop:Generator_RowDeletingName="minutesRowDeleting" msprop:Generator_RowChangingName="minutesRowChanging" msprop:Generator_RowEvHandlerName="minutesRowChangeEventHandler" msprop:Generator_RowDeletedName="minutesRowDeleted" msprop:Generator_UserTableName="minutes" msprop:Generator_RowChangedName="minutesRowChanged" msprop:Generator_RowEvArgName="minutesRowChangeEvent" msprop:Generator_RowClassName="minutesRow">
<xs:element name="minutes" msprop:Generator_TableClassName="minutesDataTable" msprop:Generator_TableVarName="tableminutes" msprop:Generator_RowChangedName="minutesRowChanged" msprop:Generator_TablePropName="minutes" msprop:Generator_RowDeletingName="minutesRowDeleting" msprop:Generator_RowChangingName="minutesRowChanging" msprop:Generator_RowEvHandlerName="minutesRowChangeEventHandler" msprop:Generator_RowDeletedName="minutesRowDeleted" msprop:Generator_RowClassName="minutesRow" msprop:Generator_UserTableName="minutes" msprop:Generator_RowEvArgName="minutesRowChangeEvent">
<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" />
@@ -516,7 +516,7 @@ WHERE gcode = @gcode and idx =@idx
</xs:sequence>
</xs:complexType>
</xs:element>
<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: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: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" />
@@ -568,7 +568,7 @@ WHERE gcode = @gcode and idx =@idx
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Holyday" msprop:Generator_TableClassName="HolydayDataTable" msprop:Generator_TableVarName="tableHolyday" msprop:Generator_TablePropName="Holyday" msprop:Generator_RowDeletingName="HolydayRowDeleting" msprop:Generator_RowChangingName="HolydayRowChanging" msprop:Generator_RowEvHandlerName="HolydayRowChangeEventHandler" msprop:Generator_RowDeletedName="HolydayRowDeleted" msprop:Generator_UserTableName="Holyday" msprop:Generator_RowChangedName="HolydayRowChanged" msprop:Generator_RowEvArgName="HolydayRowChangeEvent" msprop:Generator_RowClassName="HolydayRow">
<xs:element name="Holyday" msprop:Generator_TableClassName="HolydayDataTable" msprop:Generator_TableVarName="tableHolyday" msprop:Generator_RowChangedName="HolydayRowChanged" msprop:Generator_TablePropName="Holyday" msprop:Generator_RowDeletingName="HolydayRowDeleting" msprop:Generator_RowChangingName="HolydayRowChanging" msprop:Generator_RowEvHandlerName="HolydayRowChangeEventHandler" msprop:Generator_RowDeletedName="HolydayRowDeleted" msprop:Generator_RowClassName="HolydayRow" msprop:Generator_UserTableName="Holyday" msprop:Generator_RowEvArgName="HolydayRowChangeEvent">
<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" />
@@ -645,14 +645,14 @@ WHERE gcode = @gcode and idx =@idx
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vHoliday_uselist" msprop:Generator_TableClassName="vHoliday_uselistDataTable" msprop:Generator_TableVarName="tablevHoliday_uselist" msprop:Generator_TablePropName="vHoliday_uselist" msprop:Generator_RowDeletingName="vHoliday_uselistRowDeleting" msprop:Generator_RowChangingName="vHoliday_uselistRowChanging" msprop:Generator_RowEvHandlerName="vHoliday_uselistRowChangeEventHandler" msprop:Generator_RowDeletedName="vHoliday_uselistRowDeleted" msprop:Generator_UserTableName="vHoliday_uselist" msprop:Generator_RowChangedName="vHoliday_uselistRowChanged" msprop:Generator_RowEvArgName="vHoliday_uselistRowChangeEvent" msprop:Generator_RowClassName="vHoliday_uselistRow">
<xs:element name="vHoliday_uselist" msprop:Generator_TableClassName="vHoliday_uselistDataTable" msprop:Generator_TableVarName="tablevHoliday_uselist" msprop:Generator_RowChangedName="vHoliday_uselistRowChanged" msprop:Generator_TablePropName="vHoliday_uselist" msprop:Generator_RowDeletingName="vHoliday_uselistRowDeleting" msprop:Generator_RowChangingName="vHoliday_uselistRowChanging" msprop:Generator_RowEvHandlerName="vHoliday_uselistRowChangeEventHandler" msprop:Generator_RowDeletedName="vHoliday_uselistRowDeleted" msprop:Generator_RowClassName="vHoliday_uselistRow" msprop:Generator_UserTableName="vHoliday_uselist" msprop:Generator_RowEvArgName="vHoliday_uselistRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="1" />
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>

View File

@@ -1 +1,15 @@

<?xml version="1.0" encoding="utf-8"?>
<!--<autogenerated>
This code was generated by a tool to store the dataset designer's layout information.
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</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="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:minutes" ZOrder="4" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Board" ZOrder="3" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Holyday" ZOrder="2" X="581" Y="70" Height="324" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vHoliday_uselist" ZOrder="1" X="865" Y="70" Height="286" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
</Shapes>
<Connectors />
</DiagramLayout>

View File

@@ -161,6 +161,12 @@
<Compile Include="Note\fNote.Designer.cs">
<DependentUpon>fNote.cs</DependentUpon>
</Compile>
<Compile Include="Note\fTextEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Note\fTextEditor.Designer.cs">
<DependentUpon>fTextEditor.cs</DependentUpon>
</Compile>
<Compile Include="Note\fNote_Add.cs">
<SubType>Form</SubType>
</Compile>
@@ -298,6 +304,9 @@
<EmbeddedResource Include="Note\fNote.resx">
<DependentUpon>fNote.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Note\fTextEditor.resx">
<DependentUpon>fTextEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Note\fNote_Add.resx">
<DependentUpon>fNote_Add.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1,130 @@
namespace FPJ0000.Note
{
partial class fTextEditor
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
this.btSave = new System.Windows.Forms.Button();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.SuspendLayout();
//
// bs
//
this.bs.DataMember = "JobReport";
this.bs.DataSource = this.dsPRJ;
//
// dsPRJ
//
this.dsPRJ.DataSetName = "dsPRJ";
this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// btSave
//
this.btSave.BackColor = System.Drawing.Color.SkyBlue;
this.btSave.Dock = System.Windows.Forms.DockStyle.Bottom;
this.btSave.Location = new System.Drawing.Point(0, 632);
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(969, 49);
this.btSave.TabIndex = 20;
this.btSave.Text = "저장(&S)";
this.btSave.UseVisualStyleBackColor = false;
this.btSave.Click += new System.EventHandler(this.button1_Click);
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.EETGW_NoteTableAdapter = null;
this.tam.JobReportTableAdapter = this.ta;
this.tam.ProjectsHistoryTableAdapter = null;
this.tam.ProjectsIOMapTableAdapter = null;
this.tam.ProjectsMailListTableAdapter = null;
this.tam.ProjectsPartTableAdapter = null;
this.tam.ProjectsScheduleTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.SPMasterTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// richTextBoxEx1
//
this.richTextBoxEx1.AllowBullets = true;
this.richTextBoxEx1.AllowDefaultInsertText = true;
this.richTextBoxEx1.AllowDefaultSmartText = true;
this.richTextBoxEx1.AllowHyphenation = true;
this.richTextBoxEx1.AllowPictures = true;
this.richTextBoxEx1.AllowSpellCheck = true;
this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBoxEx1.FilePath = "";
this.richTextBoxEx1.Location = new System.Drawing.Point(0, 0);
this.richTextBoxEx1.Name = "richTextBoxEx1";
this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n\\viewkind4\\uc" +
"1\\pard\\lang1042\\fs20 richTextBoxEx1\\par\r\n}\r\n";
this.richTextBoxEx1.SetColorWithFont = true;
this.richTextBoxEx1.ShowToolStrip = true;
this.richTextBoxEx1.Size = new System.Drawing.Size(969, 632);
this.richTextBoxEx1.TabIndex = 58;
//
// fTextEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(969, 681);
this.Controls.Add(this.richTextBoxEx1);
this.Controls.Add(this.btSave);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fTextEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "문자 편집";
this.Load += new System.EventHandler(this.fJobReport_Add_Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.ResumeLayout(false);
}
#endregion
private dsPRJ dsPRJ;
private System.Windows.Forms.BindingSource bs;
private dsPRJTableAdapters.JobReportTableAdapter ta;
private dsPRJTableAdapters.TableAdapterManager tam;
private System.Windows.Forms.Button btSave;
public RichTextBoxEx.RichTextBoxEx richTextBoxEx1;
}
}

View File

@@ -0,0 +1,88 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace FPJ0000.Note
{
public partial class fTextEditor : Form
{
Boolean bInit = false;
public fTextEditor(string rtf)
{
InitializeComponent();
this.KeyPreview = true;
this.StartPosition = FormStartPosition.CenterScreen;
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.Escape) this.Close();
};
if (string.IsNullOrEmpty(rtf) == false) this.richTextBoxEx1.Rtf = rtf;
else this.richTextBoxEx1.Text = string.Empty;
}
private void fJobReport_Add_Load(object sender, EventArgs e)
{
this.Show();
Application.DoEvents();
this.richTextBoxEx1.Focus();
bInit = true;
}
// editform.editor ed;
void ctl_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
Control ctl = sender as Control;
string nm = ctl.Name.ToLower();
string search = ctl.Text.Trim();
Console.WriteLine("inner keydown " + nm + ":" + search);
switch (nm)
{
//case "cmbrequest":
// //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다.
// var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc");
// if (lastprocess != "") cbProcess.Text = lastprocess;
// tbSID.Focus();
// break;
case "tbdescription":
if (e.Control)
{
btSave.Focus();
}
break;
default:
SendKeys.Send("{TAB}");
break;
}
}
}
private void button1_Click(object sender, EventArgs e)
{
this.Invalidate();
DialogResult = System.Windows.Forms.DialogResult.OK;
}
}
}

View File

@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>164, 17</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 17</value>
</metadata>
</root>

View File

@@ -49,7 +49,7 @@
System.Windows.Forms.Label label5;
System.Windows.Forms.Label label7;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
this.tbIdx = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
@@ -96,6 +96,7 @@
this.cmbPart = new System.Windows.Forms.ComboBox();
this.arLabel1 = new arCtl.arLabel();
this.panel1 = new System.Windows.Forms.Panel();
this.checkBox2 = new System.Windows.Forms.CheckBox();
this.cmbCate = new System.Windows.Forms.ComboBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.textBox4 = new System.Windows.Forms.TextBox();
@@ -136,6 +137,23 @@
this.bsSchedule = new System.Windows.Forms.BindingSource(this.components);
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter();
this.panel4 = new System.Windows.Forms.Panel();
this.rtBef = new System.Windows.Forms.RichTextBox();
this.arLabel8 = new arCtl.arLabel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel8 = new System.Windows.Forms.Panel();
this.rtDesc = new System.Windows.Forms.RichTextBox();
this.arLabel11 = new arCtl.arLabel();
this.arPanel3 = new arCtl.arPanel();
this.rtBack = new System.Windows.Forms.RichTextBox();
this.arLabel10 = new arCtl.arLabel();
this.panel6 = new System.Windows.Forms.Panel();
this.rtAft = new System.Windows.Forms.RichTextBox();
this.arLabel9 = new arCtl.arLabel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.arLabel12 = new arCtl.arLabel();
nameLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
usermainLabel = new System.Windows.Forms.Label();
@@ -171,6 +189,14 @@
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit();
this.bindingNavigator1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).BeginInit();
this.panel4.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel8.SuspendLayout();
this.arPanel3.SuspendLayout();
this.panel6.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.SuspendLayout();
//
// nameLabel
@@ -194,34 +220,37 @@
// usermainLabel
//
usermainLabel.AutoSize = true;
usermainLabel.Location = new System.Drawing.Point(213, 35);
usermainLabel.Font = new System.Drawing.Font("맑은 고딕", 12F);
usermainLabel.Location = new System.Drawing.Point(49, 66);
usermainLabel.Name = "usermainLabel";
usermainLabel.Size = new System.Drawing.Size(29, 12);
usermainLabel.Size = new System.Drawing.Size(43, 21);
usermainLabel.TabIndex = 24;
usermainLabel.Text = "H/W";
//
// usersubLabel
//
usersubLabel.AutoSize = true;
usersubLabel.Location = new System.Drawing.Point(214, 62);
usersubLabel.Font = new System.Drawing.Font("맑은 고딕", 12F);
usersubLabel.Location = new System.Drawing.Point(52, 99);
usersubLabel.Name = "usersubLabel";
usersubLabel.Size = new System.Drawing.Size(29, 12);
usersubLabel.Size = new System.Drawing.Size(40, 21);
usersubLabel.TabIndex = 26;
usersubLabel.Text = "S/W";
//
// userManagerLabel
//
userManagerLabel.AutoSize = true;
userManagerLabel.Location = new System.Drawing.Point(22, 34);
userManagerLabel.Font = new System.Drawing.Font("맑은 고딕", 12F);
userManagerLabel.Location = new System.Drawing.Point(9, 33);
userManagerLabel.Name = "userManagerLabel";
userManagerLabel.Size = new System.Drawing.Size(63, 12);
userManagerLabel.Size = new System.Drawing.Size(84, 21);
userManagerLabel.TabIndex = 32;
userManagerLabel.Text = "Champion";
//
// costoLabel
//
costoLabel.AutoSize = true;
costoLabel.Location = new System.Drawing.Point(189, 37);
costoLabel.Location = new System.Drawing.Point(189, 36);
costoLabel.Name = "costoLabel";
costoLabel.Size = new System.Drawing.Size(66, 12);
costoLabel.TabIndex = 40;
@@ -230,7 +259,7 @@
// costnLabel
//
costnLabel.AutoSize = true;
costnLabel.Location = new System.Drawing.Point(23, 37);
costnLabel.Location = new System.Drawing.Point(23, 36);
costnLabel.Name = "costnLabel";
costnLabel.Size = new System.Drawing.Size(62, 12);
costnLabel.TabIndex = 42;
@@ -239,7 +268,7 @@
// costeLabel
//
costeLabel.AutoSize = true;
costeLabel.Location = new System.Drawing.Point(355, 37);
costeLabel.Location = new System.Drawing.Point(355, 36);
costeLabel.Name = "costeLabel";
costeLabel.Size = new System.Drawing.Size(70, 12);
costeLabel.TabIndex = 44;
@@ -248,7 +277,7 @@
// cntLabel
//
cntLabel.AutoSize = true;
cntLabel.Location = new System.Drawing.Point(56, 65);
cntLabel.Location = new System.Drawing.Point(56, 64);
cntLabel.Name = "cntLabel";
cntLabel.Size = new System.Drawing.Size(29, 12);
cntLabel.TabIndex = 46;
@@ -315,9 +344,10 @@
// label8
//
label8.AutoSize = true;
label8.Location = new System.Drawing.Point(387, 35);
label8.Font = new System.Drawing.Font("맑은 고딕", 12F);
label8.Location = new System.Drawing.Point(50, 132);
label8.Name = "label8";
label8.Size = new System.Drawing.Size(29, 12);
label8.Size = new System.Drawing.Size(42, 21);
label8.TabIndex = 87;
label8.Text = "전장";
//
@@ -344,9 +374,10 @@
// label7
//
label7.AutoSize = true;
label7.Location = new System.Drawing.Point(387, 62);
label7.Font = new System.Drawing.Font("맑은 고딕", 12F);
label7.Location = new System.Drawing.Point(50, 165);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(29, 12);
label7.Size = new System.Drawing.Size(42, 21);
label7.TabIndex = 89;
label7.Text = "공정";
//
@@ -364,6 +395,7 @@
//
this.bs.DataMember = "Projects";
this.bs.DataSource = this.dsPRJ;
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
//
// dsPRJ
//
@@ -394,49 +426,52 @@
this.sdateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.sdateTextBox.Location = new System.Drawing.Point(93, 31);
this.sdateTextBox.Name = "sdateTextBox";
this.sdateTextBox.Size = new System.Drawing.Size(166, 21);
this.sdateTextBox.Size = new System.Drawing.Size(190, 21);
this.sdateTextBox.TabIndex = 11;
//
// edateTextBox
//
this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true));
this.edateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.edateTextBox.Location = new System.Drawing.Point(356, 57);
this.edateTextBox.Location = new System.Drawing.Point(341, 58);
this.edateTextBox.Name = "edateTextBox";
this.edateTextBox.Size = new System.Drawing.Size(166, 21);
this.edateTextBox.Size = new System.Drawing.Size(190, 21);
this.edateTextBox.TabIndex = 13;
//
// usermainTextBox
//
this.usermainTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true));
this.usermainTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.usermainTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.usermainTextBox.Location = new System.Drawing.Point(249, 31);
this.usermainTextBox.Location = new System.Drawing.Point(98, 63);
this.usermainTextBox.Name = "usermainTextBox";
this.usermainTextBox.Size = new System.Drawing.Size(113, 21);
this.usermainTextBox.Size = new System.Drawing.Size(440, 29);
this.usermainTextBox.TabIndex = 25;
//
// usersubTextBox
//
this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true));
this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.usersubTextBox.Location = new System.Drawing.Point(249, 58);
this.usersubTextBox.Location = new System.Drawing.Point(98, 96);
this.usersubTextBox.Name = "usersubTextBox";
this.usersubTextBox.Size = new System.Drawing.Size(113, 21);
this.usersubTextBox.Size = new System.Drawing.Size(440, 29);
this.usersubTextBox.TabIndex = 27;
//
// userManagerTextBox
//
this.userManagerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true));
this.userManagerTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.userManagerTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.userManagerTextBox.Location = new System.Drawing.Point(93, 30);
this.userManagerTextBox.Location = new System.Drawing.Point(98, 30);
this.userManagerTextBox.Name = "userManagerTextBox";
this.userManagerTextBox.Size = new System.Drawing.Size(113, 21);
this.userManagerTextBox.Size = new System.Drawing.Size(440, 29);
this.userManagerTextBox.TabIndex = 33;
//
// costoTextBox
//
this.costoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.costoTextBox.Location = new System.Drawing.Point(261, 33);
this.costoTextBox.Location = new System.Drawing.Point(261, 32);
this.costoTextBox.Name = "costoTextBox";
this.costoTextBox.Size = new System.Drawing.Size(88, 21);
this.costoTextBox.TabIndex = 41;
@@ -445,7 +480,7 @@
// costnTextBox
//
this.costnTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.costnTextBox.Location = new System.Drawing.Point(93, 33);
this.costnTextBox.Location = new System.Drawing.Point(93, 32);
this.costnTextBox.Name = "costnTextBox";
this.costnTextBox.Size = new System.Drawing.Size(88, 21);
this.costnTextBox.TabIndex = 43;
@@ -455,7 +490,7 @@
//
this.costeTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.costeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "coste", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.costeTextBox.Location = new System.Drawing.Point(434, 33);
this.costeTextBox.Location = new System.Drawing.Point(434, 32);
this.costeTextBox.Name = "costeTextBox";
this.costeTextBox.Size = new System.Drawing.Size(88, 21);
this.costeTextBox.TabIndex = 45;
@@ -464,7 +499,7 @@
// cntTextBox
//
this.cntTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cnt", true));
this.cntTextBox.Location = new System.Drawing.Point(93, 60);
this.cntTextBox.Location = new System.Drawing.Point(93, 59);
this.cntTextBox.Name = "cntTextBox";
this.cntTextBox.Size = new System.Drawing.Size(88, 21);
this.cntTextBox.TabIndex = 47;
@@ -480,16 +515,16 @@
this.remark_reqTextBox.Multiline = true;
this.remark_reqTextBox.Name = "remark_reqTextBox";
this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.remark_reqTextBox.Size = new System.Drawing.Size(433, 120);
this.remark_reqTextBox.Size = new System.Drawing.Size(411, 215);
this.remark_reqTextBox.TabIndex = 49;
//
// ddateTextBox
//
this.ddateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true));
this.ddateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.ddateTextBox.Location = new System.Drawing.Point(356, 31);
this.ddateTextBox.Location = new System.Drawing.Point(341, 31);
this.ddateTextBox.Name = "ddateTextBox";
this.ddateTextBox.Size = new System.Drawing.Size(166, 21);
this.ddateTextBox.Size = new System.Drawing.Size(190, 21);
this.ddateTextBox.TabIndex = 53;
//
// assetTextBox
@@ -523,14 +558,14 @@
this.btMailAddr,
this.btPath,
this.btSendMail});
this.bn.Location = new System.Drawing.Point(0, 517);
this.bn.Location = new System.Drawing.Point(0, 686);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(1008, 25);
this.bn.Size = new System.Drawing.Size(984, 25);
this.bn.TabIndex = 65;
this.bn.Text = "bindingNavigator1";
//
@@ -679,7 +714,7 @@
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(433, 296);
this.dataGridView1.Size = new System.Drawing.Size(411, 354);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick);
//
@@ -704,8 +739,8 @@
//
this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle8;
this.dataGridViewTextBoxColumn10.HeaderText = "비고";
this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
this.dataGridViewTextBoxColumn10.ReadOnly = true;
@@ -753,9 +788,9 @@
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true));
this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.textBox1.Location = new System.Drawing.Point(93, 57);
this.textBox1.Location = new System.Drawing.Point(93, 58);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(166, 21);
this.textBox1.Size = new System.Drawing.Size(190, 21);
this.textBox1.TabIndex = 79;
//
// panel7
@@ -768,7 +803,7 @@
this.panel7.Controls.Add(reqstaffLabel);
this.panel7.Controls.Add(this.cmbProcess);
this.panel7.Controls.Add(label1);
this.panel7.Location = new System.Drawing.Point(12, 165);
this.panel7.Location = new System.Drawing.Point(6, 182);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(547, 64);
this.panel7.TabIndex = 85;
@@ -833,6 +868,7 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Gainsboro;
this.panel1.Controls.Add(this.checkBox2);
this.panel1.Controls.Add(this.cmbCate);
this.panel1.Controls.Add(label5);
this.panel1.Controls.Add(this.linkLabel1);
@@ -850,11 +886,21 @@
this.panel1.Controls.Add(label2);
this.panel1.Controls.Add(nameLabel);
this.panel1.Controls.Add(this.tbIdx);
this.panel1.Location = new System.Drawing.Point(12, 9);
this.panel1.Location = new System.Drawing.Point(6, 6);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(547, 145);
this.panel1.Size = new System.Drawing.Size(547, 169);
this.panel1.TabIndex = 86;
//
// checkBox2
//
this.checkBox2.AutoSize = true;
this.checkBox2.Location = new System.Drawing.Point(93, 144);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(70, 16);
this.checkBox2.TabIndex = 88;
this.checkBox2.Text = "Fan-Out";
this.checkBox2.UseVisualStyleBackColor = true;
//
// cmbCate
//
this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
@@ -963,27 +1009,29 @@
this.panel5.Controls.Add(this.usermainTextBox);
this.panel5.Controls.Add(userManagerLabel);
this.panel5.Controls.Add(this.userManagerTextBox);
this.panel5.Location = new System.Drawing.Point(12, 235);
this.panel5.Location = new System.Drawing.Point(6, 252);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(547, 88);
this.panel5.Size = new System.Drawing.Size(547, 203);
this.panel5.TabIndex = 85;
//
// textBox5
//
this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userprocess", true));
this.textBox5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.textBox5.Location = new System.Drawing.Point(423, 58);
this.textBox5.Location = new System.Drawing.Point(98, 162);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(113, 21);
this.textBox5.Size = new System.Drawing.Size(440, 29);
this.textBox5.TabIndex = 90;
//
// textBox3
//
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true));
this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.textBox3.Location = new System.Drawing.Point(423, 31);
this.textBox3.Location = new System.Drawing.Point(98, 129);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(113, 21);
this.textBox3.Size = new System.Drawing.Size(440, 29);
this.textBox3.TabIndex = 88;
//
// arLabel3
@@ -1042,15 +1090,15 @@
this.panel2.Controls.Add(this.ddateTextBox);
this.panel2.Controls.Add(this.edateTextBox);
this.panel2.Controls.Add(this.textBox1);
this.panel2.Location = new System.Drawing.Point(12, 329);
this.panel2.Location = new System.Drawing.Point(6, 461);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(546, 88);
this.panel2.Size = new System.Drawing.Size(547, 94);
this.panel2.TabIndex = 86;
//
// linkLabel5
//
this.linkLabel5.AutoSize = true;
this.linkLabel5.Location = new System.Drawing.Point(17, 61);
this.linkLabel5.Location = new System.Drawing.Point(17, 62);
this.linkLabel5.Name = "linkLabel5";
this.linkLabel5.Size = new System.Drawing.Size(71, 12);
this.linkLabel5.TabIndex = 90;
@@ -1061,7 +1109,7 @@
// linkLabel4
//
this.linkLabel4.AutoSize = true;
this.linkLabel4.Location = new System.Drawing.Point(307, 61);
this.linkLabel4.Location = new System.Drawing.Point(292, 62);
this.linkLabel4.Name = "linkLabel4";
this.linkLabel4.Size = new System.Drawing.Size(41, 12);
this.linkLabel4.TabIndex = 89;
@@ -1072,7 +1120,7 @@
// linkLabel3
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(307, 35);
this.linkLabel3.Location = new System.Drawing.Point(292, 35);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(41, 12);
this.linkLabel3.TabIndex = 88;
@@ -1128,7 +1176,7 @@
this.arLabel4.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel4.SignColor = System.Drawing.Color.Yellow;
this.arLabel4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel4.Size = new System.Drawing.Size(546, 23);
this.arLabel4.Size = new System.Drawing.Size(547, 23);
this.arLabel4.TabIndex = 86;
this.arLabel4.Text = "일정";
this.arLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1147,9 +1195,9 @@
this.panel3.Controls.Add(costnLabel);
this.panel3.Controls.Add(this.costoTextBox);
this.panel3.Controls.Add(costoLabel);
this.panel3.Location = new System.Drawing.Point(12, 423);
this.panel3.Location = new System.Drawing.Point(6, 561);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(546, 88);
this.panel3.Size = new System.Drawing.Size(546, 93);
this.panel3.TabIndex = 86;
//
// arLabel5
@@ -1233,7 +1281,7 @@
this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel6.SignColor = System.Drawing.Color.Yellow;
this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel6.Size = new System.Drawing.Size(433, 23);
this.arLabel6.Size = new System.Drawing.Size(411, 23);
this.arLabel6.TabIndex = 86;
this.arLabel6.Text = "개선 방향";
this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1252,7 +1300,7 @@
this.arPanel1.ForeColor = System.Drawing.Color.Khaki;
this.arPanel1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel1.GradientRepeatBG = true;
this.arPanel1.Location = new System.Drawing.Point(565, 9);
this.arPanel1.Location = new System.Drawing.Point(559, 6);
this.arPanel1.Name = "arPanel1";
this.arPanel1.Padding = new System.Windows.Forms.Padding(1);
this.arPanel1.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
@@ -1263,7 +1311,7 @@
this.arPanel1.ProgressValue = 0F;
this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.ShowBorder = true;
this.arPanel1.Size = new System.Drawing.Size(435, 145);
this.arPanel1.Size = new System.Drawing.Size(413, 240);
this.arPanel1.TabIndex = 88;
this.arPanel1.Text = "arPanel1";
this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1283,7 +1331,7 @@
this.arPanel2.ForeColor = System.Drawing.Color.Black;
this.arPanel2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel2.GradientRepeatBG = true;
this.arPanel2.Location = new System.Drawing.Point(565, 165);
this.arPanel2.Location = new System.Drawing.Point(559, 250);
this.arPanel2.Name = "arPanel2";
this.arPanel2.Padding = new System.Windows.Forms.Padding(1);
this.arPanel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
@@ -1294,7 +1342,7 @@
this.arPanel2.ProgressValue = 0F;
this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel2.ShowBorder = true;
this.arPanel2.Size = new System.Drawing.Size(435, 346);
this.arPanel2.Size = new System.Drawing.Size(413, 404);
this.arPanel2.TabIndex = 89;
this.arPanel2.Text = "arPanel2";
this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1321,14 +1369,14 @@
this.btwADd,
this.btwEdit,
this.btwDel});
this.bindingNavigator1.Location = new System.Drawing.Point(1, 320);
this.bindingNavigator1.Location = new System.Drawing.Point(1, 378);
this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1;
this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1;
this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1;
this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1;
this.bindingNavigator1.Size = new System.Drawing.Size(433, 25);
this.bindingNavigator1.Size = new System.Drawing.Size(411, 25);
this.bindingNavigator1.TabIndex = 87;
this.bindingNavigator1.Text = "bindingNavigator1";
//
@@ -1463,7 +1511,7 @@
this.arLabel7.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel7.SignColor = System.Drawing.Color.Yellow;
this.arLabel7.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel7.Size = new System.Drawing.Size(433, 23);
this.arLabel7.Size = new System.Drawing.Size(411, 23);
this.arLabel7.TabIndex = 86;
this.arLabel7.Text = "주간 업무 현황";
this.arLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1477,6 +1525,7 @@
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.EETGW_NoteTableAdapter = null;
this.tam.JobReportTableAdapter = null;
this.tam.ProjectsHistoryTableAdapter = null;
this.tam.ProjectsIOMapTableAdapter = null;
@@ -1500,18 +1549,402 @@
//
this.taSchedule.ClearBeforeFill = true;
//
// panel4
//
this.panel4.BackColor = System.Drawing.Color.Gainsboro;
this.panel4.Controls.Add(this.rtBef);
this.panel4.Controls.Add(this.arLabel8);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(3, 257);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(479, 362);
this.panel4.TabIndex = 90;
//
// rtBef
//
this.rtBef.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtBef.Location = new System.Drawing.Point(0, 23);
this.rtBef.Name = "rtBef";
this.rtBef.ReadOnly = true;
this.rtBef.Size = new System.Drawing.Size(479, 339);
this.rtBef.TabIndex = 87;
this.rtBef.Text = "";
this.rtBef.Click += new System.EventHandler(this.rtBack_Click);
this.rtBef.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick);
//
// arLabel8
//
this.arLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
this.arLabel8.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209)))));
this.arLabel8.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
this.arLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel8.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel8.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel8.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel8.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel8.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel8.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
this.arLabel8.GradientEnable = true;
this.arLabel8.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arLabel8.GradientRepeatBG = false;
this.arLabel8.isButton = false;
this.arLabel8.Location = new System.Drawing.Point(0, 0);
this.arLabel8.MouseDownColor = System.Drawing.Color.Yellow;
this.arLabel8.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.arLabel8.msg = null;
this.arLabel8.Name = "arLabel8";
this.arLabel8.ProgressBorderColor = System.Drawing.Color.Black;
this.arLabel8.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arLabel8.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arLabel8.ProgressEnable = false;
this.arLabel8.ProgressFont = new System.Drawing.Font("Consolas", 10F);
this.arLabel8.ProgressForeColor = System.Drawing.Color.Black;
this.arLabel8.ProgressMax = 100F;
this.arLabel8.ProgressMin = 0F;
this.arLabel8.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arLabel8.ProgressValue = 0F;
this.arLabel8.ShadowColor = System.Drawing.Color.WhiteSmoke;
this.arLabel8.Sign = "";
this.arLabel8.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel8.SignColor = System.Drawing.Color.Yellow;
this.arLabel8.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel8.Size = new System.Drawing.Size(479, 23);
this.arLabel8.TabIndex = 86;
this.arLabel8.Text = "개선 전";
this.arLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel8.TextShadow = true;
this.arLabel8.TextVisible = true;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Controls.Add(this.panel8, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.arPanel3, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.panel6, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.panel4, 0, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 35);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 254F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(970, 622);
this.tableLayoutPanel1.TabIndex = 91;
//
// panel8
//
this.panel8.BackColor = System.Drawing.Color.Gainsboro;
this.panel8.Controls.Add(this.rtDesc);
this.panel8.Controls.Add(this.arLabel11);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(488, 3);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(479, 248);
this.panel8.TabIndex = 94;
//
// rtDesc
//
this.rtDesc.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtDesc.Location = new System.Drawing.Point(0, 23);
this.rtDesc.Name = "rtDesc";
this.rtDesc.ReadOnly = true;
this.rtDesc.Size = new System.Drawing.Size(479, 225);
this.rtDesc.TabIndex = 87;
this.rtDesc.Text = "";
this.rtDesc.Click += new System.EventHandler(this.rtBack_Click);
this.rtDesc.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick);
//
// arLabel11
//
this.arLabel11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
this.arLabel11.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209)))));
this.arLabel11.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
this.arLabel11.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel11.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel11.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel11.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel11.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel11.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel11.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
this.arLabel11.GradientEnable = true;
this.arLabel11.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arLabel11.GradientRepeatBG = false;
this.arLabel11.isButton = false;
this.arLabel11.Location = new System.Drawing.Point(0, 0);
this.arLabel11.MouseDownColor = System.Drawing.Color.Yellow;
this.arLabel11.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.arLabel11.msg = null;
this.arLabel11.Name = "arLabel11";
this.arLabel11.ProgressBorderColor = System.Drawing.Color.Black;
this.arLabel11.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arLabel11.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arLabel11.ProgressEnable = false;
this.arLabel11.ProgressFont = new System.Drawing.Font("Consolas", 10F);
this.arLabel11.ProgressForeColor = System.Drawing.Color.Black;
this.arLabel11.ProgressMax = 100F;
this.arLabel11.ProgressMin = 0F;
this.arLabel11.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arLabel11.ProgressValue = 0F;
this.arLabel11.ShadowColor = System.Drawing.Color.WhiteSmoke;
this.arLabel11.Sign = "";
this.arLabel11.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel11.SignColor = System.Drawing.Color.Yellow;
this.arLabel11.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel11.Size = new System.Drawing.Size(479, 23);
this.arLabel11.TabIndex = 86;
this.arLabel11.Text = "완료내역";
this.arLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel11.TextShadow = true;
this.arLabel11.TextVisible = true;
//
// arPanel3
//
this.arPanel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.arPanel3.BorderSize = new System.Windows.Forms.Padding(1);
this.arPanel3.Controls.Add(this.rtBack);
this.arPanel3.Controls.Add(this.arLabel10);
this.arPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.arPanel3.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arPanel3.ForeColor = System.Drawing.Color.Khaki;
this.arPanel3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel3.GradientRepeatBG = true;
this.arPanel3.Location = new System.Drawing.Point(3, 3);
this.arPanel3.Name = "arPanel3";
this.arPanel3.Padding = new System.Windows.Forms.Padding(1);
this.arPanel3.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arPanel3.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arPanel3.ProgressMax = 100F;
this.arPanel3.ProgressMin = 0F;
this.arPanel3.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arPanel3.ProgressValue = 0F;
this.arPanel3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel3.ShowBorder = true;
this.arPanel3.Size = new System.Drawing.Size(479, 248);
this.arPanel3.TabIndex = 92;
this.arPanel3.Text = "arPanel3";
this.arPanel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.arPanel3.TextShadow = false;
this.arPanel3.UseProgressBar = false;
//
// rtBack
//
this.rtBack.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtBack.Location = new System.Drawing.Point(1, 24);
this.rtBack.Name = "rtBack";
this.rtBack.ReadOnly = true;
this.rtBack.Size = new System.Drawing.Size(477, 223);
this.rtBack.TabIndex = 87;
this.rtBack.Text = "";
this.rtBack.Click += new System.EventHandler(this.rtBack_Click);
this.rtBack.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick);
//
// arLabel10
//
this.arLabel10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
this.arLabel10.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209)))));
this.arLabel10.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
this.arLabel10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel10.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel10.BorderSize = new System.Windows.Forms.Padding(0, 0, 0, 1);
this.arLabel10.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel10.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel10.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel10.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
this.arLabel10.GradientEnable = true;
this.arLabel10.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arLabel10.GradientRepeatBG = false;
this.arLabel10.isButton = false;
this.arLabel10.Location = new System.Drawing.Point(1, 1);
this.arLabel10.MouseDownColor = System.Drawing.Color.Yellow;
this.arLabel10.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.arLabel10.msg = null;
this.arLabel10.Name = "arLabel10";
this.arLabel10.ProgressBorderColor = System.Drawing.Color.Black;
this.arLabel10.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arLabel10.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arLabel10.ProgressEnable = false;
this.arLabel10.ProgressFont = new System.Drawing.Font("Consolas", 10F);
this.arLabel10.ProgressForeColor = System.Drawing.Color.Black;
this.arLabel10.ProgressMax = 100F;
this.arLabel10.ProgressMin = 0F;
this.arLabel10.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arLabel10.ProgressValue = 0F;
this.arLabel10.ShadowColor = System.Drawing.Color.WhiteSmoke;
this.arLabel10.Sign = "";
this.arLabel10.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel10.SignColor = System.Drawing.Color.Yellow;
this.arLabel10.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel10.Size = new System.Drawing.Size(477, 23);
this.arLabel10.TabIndex = 86;
this.arLabel10.Text = "개선 배경";
this.arLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel10.TextShadow = true;
this.arLabel10.TextVisible = true;
//
// panel6
//
this.panel6.BackColor = System.Drawing.Color.Gainsboro;
this.panel6.Controls.Add(this.rtAft);
this.panel6.Controls.Add(this.arLabel9);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(488, 257);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(479, 362);
this.panel6.TabIndex = 90;
//
// rtAft
//
this.rtAft.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtAft.Location = new System.Drawing.Point(0, 23);
this.rtAft.Name = "rtAft";
this.rtAft.ReadOnly = true;
this.rtAft.Size = new System.Drawing.Size(479, 339);
this.rtAft.TabIndex = 87;
this.rtAft.Text = "";
this.rtAft.Click += new System.EventHandler(this.rtBack_Click);
this.rtAft.DoubleClick += new System.EventHandler(this.rtBack_DoubleClick);
//
// arLabel9
//
this.arLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
this.arLabel9.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209)))));
this.arLabel9.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
this.arLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel9.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel9.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel9.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel9.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel9.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel9.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
this.arLabel9.GradientEnable = true;
this.arLabel9.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arLabel9.GradientRepeatBG = false;
this.arLabel9.isButton = false;
this.arLabel9.Location = new System.Drawing.Point(0, 0);
this.arLabel9.MouseDownColor = System.Drawing.Color.Yellow;
this.arLabel9.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.arLabel9.msg = null;
this.arLabel9.Name = "arLabel9";
this.arLabel9.ProgressBorderColor = System.Drawing.Color.Black;
this.arLabel9.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arLabel9.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arLabel9.ProgressEnable = false;
this.arLabel9.ProgressFont = new System.Drawing.Font("Consolas", 10F);
this.arLabel9.ProgressForeColor = System.Drawing.Color.Black;
this.arLabel9.ProgressMax = 100F;
this.arLabel9.ProgressMin = 0F;
this.arLabel9.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arLabel9.ProgressValue = 0F;
this.arLabel9.ShadowColor = System.Drawing.Color.WhiteSmoke;
this.arLabel9.Sign = "";
this.arLabel9.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel9.SignColor = System.Drawing.Color.Yellow;
this.arLabel9.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel9.Size = new System.Drawing.Size(479, 23);
this.arLabel9.TabIndex = 86;
this.arLabel9.Text = "개선 후";
this.arLabel9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel9.TextShadow = true;
this.arLabel9.TextVisible = true;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(984, 686);
this.tabControl1.TabIndex = 93;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Controls.Add(this.arPanel2);
this.tabPage1.Controls.Add(this.panel7);
this.tabPage1.Controls.Add(this.arPanel1);
this.tabPage1.Controls.Add(this.panel5);
this.tabPage1.Controls.Add(this.panel3);
this.tabPage1.Controls.Add(this.panel2);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(976, 660);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "일반사항";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.tableLayoutPanel1);
this.tabPage2.Controls.Add(this.arLabel12);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(976, 660);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "완료내역";
this.tabPage2.UseVisualStyleBackColor = true;
//
// arLabel12
//
this.arLabel12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
this.arLabel12.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209)))));
this.arLabel12.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
this.arLabel12.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel12.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel12.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel12.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel12.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel12.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel12.ForeColor = System.Drawing.Color.Blue;
this.arLabel12.GradientEnable = true;
this.arLabel12.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arLabel12.GradientRepeatBG = false;
this.arLabel12.isButton = false;
this.arLabel12.Location = new System.Drawing.Point(3, 3);
this.arLabel12.MouseDownColor = System.Drawing.Color.Yellow;
this.arLabel12.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.arLabel12.msg = null;
this.arLabel12.Name = "arLabel12";
this.arLabel12.ProgressBorderColor = System.Drawing.Color.Black;
this.arLabel12.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
this.arLabel12.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
this.arLabel12.ProgressEnable = false;
this.arLabel12.ProgressFont = new System.Drawing.Font("Consolas", 10F);
this.arLabel12.ProgressForeColor = System.Drawing.Color.Black;
this.arLabel12.ProgressMax = 100F;
this.arLabel12.ProgressMin = 0F;
this.arLabel12.ProgressPadding = new System.Windows.Forms.Padding(0);
this.arLabel12.ProgressValue = 0F;
this.arLabel12.ShadowColor = System.Drawing.Color.WhiteSmoke;
this.arLabel12.Sign = "";
this.arLabel12.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel12.SignColor = System.Drawing.Color.Yellow;
this.arLabel12.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel12.Size = new System.Drawing.Size(970, 32);
this.arLabel12.TabIndex = 92;
this.arLabel12.Text = "내역을 편집하려면 각 창을 \"더블클릭\" 하세요.";
this.arLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel12.TextShadow = true;
this.arLabel12.TextVisible = true;
//
// fProjectData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1008, 542);
this.Controls.Add(this.arPanel2);
this.Controls.Add(this.arPanel1);
this.Controls.Add(this.panel3);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel5);
this.Controls.Add(this.panel7);
this.ClientSize = new System.Drawing.Size(984, 711);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.bn);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
@@ -1544,6 +1977,14 @@
this.bindingNavigator1.ResumeLayout(false);
this.bindingNavigator1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).EndInit();
this.panel4.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.panel8.ResumeLayout(false);
this.arPanel3.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1637,5 +2078,23 @@
private System.Windows.Forms.LinkLabel linkLabel5;
private System.Windows.Forms.LinkLabel linkLabel4;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Panel panel4;
private arCtl.arLabel arLabel8;
private System.Windows.Forms.CheckBox checkBox2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Panel panel6;
private arCtl.arLabel arLabel9;
private arCtl.arPanel arPanel3;
private arCtl.arLabel arLabel10;
private System.Windows.Forms.Panel panel8;
private arCtl.arLabel arLabel11;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.RichTextBox rtBef;
private System.Windows.Forms.RichTextBox rtDesc;
private System.Windows.Forms.RichTextBox rtBack;
private System.Windows.Forms.RichTextBox rtAft;
private arCtl.arLabel arLabel12;
}
}

View File

@@ -56,6 +56,10 @@ namespace FPJ0000
this.cmbPart.DataSource = dt_part;
this.bs.DataSource = dr;
if (string.IsNullOrEmpty(dr.CMP_After) == false) rtAft.Rtf = dr.CMP_After;
if (string.IsNullOrEmpty(dr.CMP_Before) == false) rtBef.Rtf = dr.CMP_Before;
if (string.IsNullOrEmpty(dr.CMP_Description) == false) rtDesc.Rtf = dr.CMP_Description;
if (string.IsNullOrEmpty(dr.CMP_Background) == false) rtBack.Rtf = dr.CMP_Background;
//주간일지내역을 업데이트
refresh_History();
@@ -64,9 +68,14 @@ namespace FPJ0000
{
if (dr.idx >= 0)
this.taSchedule.Fill(this.dsPRJ.ProjectsSchedule, this.dr.idx);
}
catch (System.Exception ex)
{
rtBack.Text = rtDesc.Text = rtAft.Text = rtBef.Text = "";
System.Windows.Forms.MessageBox.Show(ex.Message);
}
this.cmbProcess.Text = dr.process;
@@ -105,6 +114,10 @@ namespace FPJ0000
this.dr.status = cmbState.Text;
this.dr.part = cmbPart.Text;
this.dr.category = cmbCate.Text;
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
this.Validate();
this.bs.EndEdit();
@@ -297,6 +310,22 @@ namespace FPJ0000
SelectDate(textBox1);
}
private void bs_CurrentChanged(object sender, EventArgs e)
{
}
private void rtBack_Click(object sender, EventArgs e)
{
}
private void rtBack_DoubleClick(object sender, EventArgs e)
{
var rt = sender as System.Windows.Forms.RichTextBox;
var f = new Note.fTextEditor(rt.Rtf);
if (f.ShowDialog() == DialogResult.OK)
rt.Rtf = f.richTextBoxEx1.Rtf;
}
}
}

View File

@@ -177,6 +177,12 @@
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -317,6 +323,12 @@
<metadata name="bsWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 17</value>
</metadata>
<metadata name="bsWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 17</value>
</metadata>
<metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>773, 17</value>
</metadata>
<metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>773, 17</value>
</metadata>

File diff suppressed because it is too large Load Diff

View File

@@ -31,6 +31,7 @@ namespace FPJ0000
{
//프로젝트 목록을 처리함
//this.tbRequest.Text = FCOMMON.info.Login.nameK;
cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다
//분류 - 190905
var dt_cate = FCOMMON.DBM.getCodeTable("20");
@@ -126,6 +127,11 @@ namespace FPJ0000
if (state.EndsWith("(") == false) state += ",";
state += "'완료'";
}
if(chk완료보고.Checked)
{
if (state.EndsWith("(") == false) state += ",";
state += "'완료(보고)'";
}
state += ")";
}
@@ -144,10 +150,16 @@ namespace FPJ0000
string State_where = " WHERE gcode=@gcode and ";
if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
State_where += " pdate between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text +"-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
var dateField = "pdate";
if (cmbDateType.SelectedIndex == 1) dateField = "edate";
else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(usersub, '') LIKE @username) ";
if (state != "") State_where += " AND " + state;
if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'";
@@ -156,7 +168,8 @@ namespace FPJ0000
" WHEN ([status] = '검토') THEN '1' " +
" WHEN ([status] = '대기') THEN '2' " +
" WHEN ([status] = '완료') THEN '3' " +
" WHEN ([status] = '보류') THEN '4' " +
" WHEN ([status] = '완료(보고)') THEN '4' " +
" WHEN ([status] = '보류') THEN '5' " +
" WHEN ([status] = '취소') THEN '9' " +
" ELSE '5' END),userManager,sdate";
@@ -216,9 +229,12 @@ namespace FPJ0000
case "보류":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato;
break;
case "완료":
case "완료(보고)":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray;
break;
case "완료":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta;
break;
default:
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black;
break;
@@ -314,7 +330,7 @@ namespace FPJ0000
private void btSearch_Click(object sender, EventArgs e)
{
refreshData();
}
private void toolStripLabel3_Click(object sender, EventArgs e)
@@ -629,7 +645,7 @@ namespace FPJ0000
private void toolStripButton2_Click(object sender, EventArgs e)
{
this.Close();
}
private void toolStripButton1_Click(object sender, EventArgs e)
@@ -701,5 +717,15 @@ namespace FPJ0000
{
showfolder();
}
private void button1_Click_1(object sender, EventArgs e)
{
this.Close();
}
private void button2_Click(object sender, EventArgs e)
{
refreshData();
}
}
}

View File

@@ -215,49 +215,49 @@
5jGrg80jFvmZB8/1Mveb4Wru1e9gDtWGAEXH013r98dzxCPj+TBsD8b2IFxvz+HUYe0K1YYAeQeSXQuP
hXAWH0tvAuHCQylNufuSmjJ3xTWlbIlpSlgX0RSzIqgpbJFfk890twV+093qPCY61EG1MzBk70lwTduU
xlV4LG1R3oFU08wdCVap22LtUzZGOMWtDnaLXOrvFbzQ18d/pluAU6dNlUevo5dTu/U8qHYGhvStMa4x
O2O4cw8kLc7YHm1bdCz1Rt7R9JsFB5Nv5eyOv52xM/pOyoawu7Hrwu5GLgp4GrzI507ALLfXPlPdTrtP
O2O4cw8kLc7YHm1bdCz1Rt7R9JsFB5Nv5eyOv52xM/pOyoawu7Hrwu5GLgx4GrzI507ALLfXPlPdTrtP
cDzNkLA2wjVpgx9v1u74xalbolyA3viftjW6KnljRFf82rBpsatClkUtD9wUutB3T8AM14t+U12POXc7
3Hfrs98IDJP/DDHLAl2jF3vwpW6NWpywJswr/2DK/9TNEXMS1oevjFkZsi1qWeCBkIXexwNne5zxmuh8
273f7oJju+Ujx3arzdYNpv8ZQub5uvrPtxdIWBe6JHxJQBAwTP4nbQjfEbcy5BDQ/6dCFvhc8Jvpcdl7
kuM113bbB/btllct600fWdYabTStMPjP4DvdzdVzgpNr+GLfHb5TXGvTtsX8j1oRdC1sod8tv5nud32n
uz5w7Qdq7LJ5aNds/tC6xvS6aYXeQ5NyvfX6hVr/oUHJwBA032ue7wz3oMT14f/Dl/qeD5kHtHWG61X3
iY7XnLtsb9i1mN+wrDW+Zlyme1U3X/WBXp7Gaq0sVYQBQJvmAeN3XvTywP++sz0fu09yeeLUZw/0q+Uj
iY7XnLtsb9i1mN+wrDW+Zlyme1U3X/WBXp7Gaq0sVYQBQJvmAeN3XvTywP++sz0fu01yeeLYZw/0q+Uj
m0azh6blug+MSnUfaGdr3tfMULqnmaG8TDVFEWEADITM9/nvN8N9s9ckh02uXTYbgTavt6o3Xmdarr/a
oEBrhXau2lL1NJVFKsnyCxXjZTENAKa0/54THf87d9n8t2u2+A909n+Tcv3/IP9qZ6v9V09T/q+cpPBf
IU72v1y0FKYBdAYMDACYr05nDLds3wAAAABJRU5ErkJggg==
IU72v1y0FKYBdAYMDACTvk5keWFIqgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iLylIJXKgt2myz
2ZqrqWtnARJTc6xaXzRBdJdJ6YiIxipLCHGoaaSR66t9wb7AEQhEULbu6e64KUf+VK/t2W33fp5n7332
Jv4bg+MjOm8Gobe+h3Z4ESeH3oCkXj0SxiIGx2PqAc/y0sDDKMyuCIwPIiBSmV/IV1NfgBEyIih37Hu+
lzjt00HvVUPrIXHC1cL/bDQ9g5AR0e/+ys+HFvpABS7DPHcRBPLgDA098+sWmMYi/DwXwuINI1ec4eAF
v6ig1iJTVFG7UdErhdIoE/kJ62RI6MoSSWSgOjuzWlBrKVfIjWVM21grOsbbUHluJx/kGJ4IZQvs02HY
p0Jwzobw9ksS1V1TfIFysFwh69nBkHebsNdUidJTRZC2b8WILwwrp0n67w1ef0qgqt0HBbWrpuKSlGlx
NkKiL2ZKNAXbDbeWkEivwDZN8147++UL+C3YDWys6q0HIO8vQ921fTjqOIwtuk3MZs3GbdxGHbYPiKdW
4JihcXs2K2L0CY1keu1lVVdqoHWTOGKvR6mmiClszYY5dCPvsPztJ+74sxvcn2MPyfmYRq6UvXJIOotR
oi1A4fENq2EO9fVFvmCUDXJhvuAG+xC5vAjGoTL41r0D8upLxNgC19MI73UH2AIukK/qLs9vISOimXqO
aPIH6HgGn6NpBOkUiD16L/Ilab5nFzIijpkXJhq6A6lD3fOoO+/H/jNr9/KPEMQfqHUtYwtqArUAAAAA
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpa5NWhotMFCK
kEIlZm3ThpqM7EVWuqbczJWy1lqMynJLJ1NTl7akV3uZvWx3bW5rbWV0T/d+d9Hd5U/1gcOF+5xzePjy
UP+NwfER7bcC0FvfQze4iFMDb6CmXz0WxiL6x6KavtHlpb5HEZhdYfQ8DINKpn8hV/XGWVbIiKDd0e+5
XuqMtwV6jwa6UTVOuhrJzzrTMwgZEb3ur2Q+sHAFtP8yzHNdoJADbzh8aX7dAtNImMyzoSyeELLFGw5d
9IkKqiwyRQW9G2XdUih7ZCI/ZZ0ICl0ZwvE0VJ3TqwVVllKFvKuEbR5pQttYM8rP7SRBnsHxYKbAPhWC
fTII50wQb78ksK9jkhQo+0sVsvM7WPW9euw1laP4dAGkrVsx5A3BymuC+XuD15/iqGj1QkHvqizrlLKN
zjpItIVskTZvu+H2EuKpFdimGOK1c19SQLbgNrBxqrEehLy3BNXX9+OY4wi2aDexm7Ubt/Ebtdk+IJZc
gWOawZ2ZjKjhJwwSqbWXVV2thM6txlF7DYq1BWx+UybM0zL0DsvffuKuL7PBgznukJyzDLKl7JZD0l6I
Il0e8k9sWA3zaG4skoJhLsiHScFN7iGyeRGIQWXwrnsH6msvEeUKXE/DxOv2cwV8IFfyDvdvISOigX6O
SOIHmFganyMpBJgkqD16D3IlabhvFzIijpsXxmuN/mStcR7VF3w4cHbtXv4RivoDQ7YtM+s88H0AAAAA
SUVORK5CYII=
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZBJTBNhHMV78M7NuwdPoAeg9eDBg4nRm4mJ
4YIkGi/gwUBCjAeUGJBIJGERDRJUxLIKQoHQEkJKoLQgi7TCdLUblVZgykxn7XSeX8soeDBxeZmX+Wby
/d5/0f23qPGi9ZC1VA7PlR3zDdk7ed7ve3/2pH+gKO8XTxflzc5eOKHhOp17zCCqagaASp6sD89pIYGo
rVyKLJaLPxxbuSdEHVUharTwuoaTgBF9UlUEiNEmcIFmcMFX4ENDUNM0yUpBVVjig8Pv9D45S5J72ODS
cJ3O069nMvIBgduQ8rWC+VyLvaVyJJbvgHbWgd54CHr9PvbXqokrSWdxeIaLWQ0nAYN6Oc3vgHa1YX+1
AXFrFfi4g1RitOrZd/JnB9nx3IN6QcNJgPGcnJs/IxLzgMLlQIWnIMaeweXqh8lmR9dMEL3z27CsheE0
XhI1nAS8NkiqwkNh7EjTZsi7Q5B2OiFEGuHceIvxlTi8Xzl82RXh8DOYWv+GMZNR0XCyxA6DmJEZyHsm
SPGeXFUhXAc+UI0BWwybURZLQR62AIcFYmdMRN9cEBpOAlqLBVWmCfwG4nYzhFAtgSvBeW7l2vYlRNj8
Kcz7UpihWKyERfRYo8cCnhbGpKQ3yfp6MylvF1hPO1iqCexWPfrIzJvbHKyeQzjrjxERHZPuowCqPv8u
1VBg3HpckNhqOCMc98RIr+LwMVgl0GJQwDKpbvrE4kX3qGquuVimRfxeLebgqQ5L8MEg2UX/QgwvLYFM
e/eE6pzqhL2tlHlXkV+iXf1zfai5ctv+/CYdMLdg8tFlTvv9d+quOF0y3XiNtzy5erSLf5NO9x1jfCdF
5VlLZAAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVHcaXbkwcaV1
ZeJjAy5MTVi4QIkBUROUh5rUBkWQVxHUIqFFghhoeVheLXXoy7aUSiswZabz6HQ6x9syCi5MfJzck5k7
ud/5//8O9d/y9JfMhYfOyZH353dYL/sGjgb8rw7sDnSXFPzioZKCkZFjuzScolw9OklVswBUsnLees+I
CUQ/lKWXHZelH445DWLYYQjTbw6d1XCKcveVJlVFhBStAx+sBx96BiHcAzXDkKwUVIUj3tzaZzYgCVya
7tW5NZyivO0H2ay8SeAmpPyNYBersD5VhsT0VTCuajALt8DM3cDGbAWxgXQWh7f3MKfhJMBcKmeEVTDu
JmzM1CI+eh1CfJJUZbXquWfyZwe58VzmYlHDcx0ckfPzZyViAVD4PKgINKTYI7jdXbDYJ9A8HELH2Aps
sxE4W49LGk4CjLq0qghQ2AlkGCvktR6kV00Ql+/DtdCKfmccvq88vqxJmAywGJz7hreW54qGk79g1ElZ
mYW8bkE63pavKkaqIQQr0G2PwRPlMBUSYA/yGCd2xSR0fgxBw0nAg2JRlRkCt0BaqYcYriKwAbz3Ur5t
f0KCPZDCmD+FYZqDMyKhbTS6HbB0tygmJBeT656ObMrXDM77GBxdB+5zDTrJzJ4VHqPeLTjnT8sSjANL
2wF0TeE1unZ/u/vOvsR8bZG40+/6WpRJP4sZAjlCIqZJdcs8hwaTWbVWnrygRfxeDdbQHqMtdNNM7qJr
PIanNjr70NSnugZNmGjUsy/LC/Xa0T/X68pTVxxPLjJBawMGbp/gtc9/pxfle/WD1acF270z23fxb6Ko
710hJfIYihq0AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -312,11 +312,26 @@
<value>248, 17</value>
</metadata>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>828, 17</value>
<value>17, 56</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>455, 17</value>
</metadata>
<metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>647, 17</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>169, 56</value>
</metadata>
<data name="chk검토.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -425,25 +440,22 @@
AABJRU5ErkJggg==
</value>
</data>
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="chk완료보고.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei
QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG
A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF
GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG
cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E
dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR
DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il
zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij
KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY
UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE
SLgGHtI0c5mHtr07qCltE4bNtEgD52FJimiWpVY7OJOpczadU8rEZVNCzN10oNowOtjT+45JGhUEPfDw
+158P8/vTPx3ZU8lRJ0aP6xOdxz0JZn2BpJMsQGhLcYntO5Wp1h2RYXbfq8cV7wo1bHfr3JkoMNrQO9i
Z8jt8w0osqUgsZvyH+kmReH2rcpxHhIJRwTBuhktrMt9aH1+HbqZspDZ2rzci9qJC9hn4AcP3OBtDTk5
FhcpsgtWWZhtrPBIUOougmKiACrGJYzLJ4thenkXl52l2GPgrMYayMgwThAZdoGGHk4LzczCLEi7zkI6
ngep8wzkzjzYVyzQuGQwMyHZt48h+tp2TRgnCOGjWF+7twFGbz1KJwsheyxmwFzIxhg7cjHyygZW/uAK
mp/WonWmFlQ1xxfGCeKoKXrt/tItVHoUULrymZX0Y/7dLOjRPAyvDITgb+tf0fzkCjSjhej1toPUblsL
4wSReI9a61vsgtZNo9KtxIfP70PQ20+vQyMLG6arIbdlQm0/hz5vG8iKzQFdlO/mbD1a5q5CNSaGfrIc
wS8fQ/D693UYpi5BYk2Dgglo9FShxaUHpdq0hbgOUiPuT4Zp6Q7KR8WQ23NQNV6ChTdzaJ6uwXlLKqTm
dKisWTC96MJxYwLIMu7PQxS0kpHs1egdCjzwdaNs6DSUg1mgBzIgM7Nm4Uw8XOiEdqAQJM1ZJelN18gq
po4n2qHlBXV2CcxMSJNHD/VQPi4OitHEbMHEwGprPvgF3CAp/+UhbWhnDU9EaSP8J9oS0eLWo+eZET2z
RhhcOiQ3xiOiOMJPSv8Ab4iv40eRGq6aquD4SCU3QNLcACVhapqr5kv4f/9M/y6C+AFrq7EfCv24YgAA
AABJRU5ErkJggg==
</value>
</data>
<data name="btViewDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -456,19 +468,48 @@
4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>647, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAABEpJREFUSEut
V+tPW2UYb7xE/wQvMZmZbs7v6hK/+M24EKfMpoiWy+hYUTZxso3aoWepwfXCoKYNqw500hVQ0Mgc98Kq
bSllA3YxM2SUgq7MGwV0fpv1/R19Tt8eXuua8uHXnvPcfue9PM/7vJpnawpyglb72Z3PH/rqgV31g08V
1g89vdM8+NAz0thdIttsEArV0EkjW8obI/bqlov+N9uuLtR555elnsRfR3sSqUOfXvuz2DK6Q+SXDUIh
oUga21ThnOwwnY79ZutLpuz9K+vw3pc/pV6xjBSI/LNBKARKbeHa2lOzP9r7xYQENXGZPeSvOfldXI0S
W3DxpXcGdpJdBhmANdztiHik7sRNngAjNncsrO7zXA5XuWY6Kp3nP9rjnGitdEZ7tZL/SfKvPnFpkPcD
TL74Db0jpOd5lAcCSBt6f7lFTra+ldTh9mvXdx+PenQNI1vU9mqsJ06myhzjvWq7jBdMLz9S69nl1F7X
hYDeHniYt8sG0Yjf7b5+s9Qa2s/bKQ/YSP+saZrU0Bz94rl9fffwDv8HIjZ3xpPHvl5WyGs/mV3kB6A4
MJJO2kiYXqN76lyupACI5TW1BiuMrukwESOmoXmynezkn1cto1uRMmSENc1lennoraFzenuoCM8vWgLb
EIvimryxG8WWoUehk43L7WE75Sn+K5omTlCgXPFCXf8m/p3NZFs6JZMpFCLIZSUqEn2V2Te/tuvfr9oI
IBNYzFWK/3rLzBDkct6iDJJiv+dySO2cL6o9VyIUH1yo7ZoC85kHTb7YCimq3FOdIud8YPxguovim3zz
KzhkNIXS8PajPUtKwTA0TXpEzvnA4Jz0UHwcLoXm4e0aHG/sJU3MjETO+WBPc/RDhbg7cauwvv8Jear5
xd/rvrDxU+2e/pzi13ljyzsOnr1PU1l5/u7MzXUlInLOB9WeS8rmOtD2/Tw2tKx4reXiCCnMvvjqRqbT
y9LYY+auhTWKz7iGIZeV7ERy8EmOpOed1UUhFxiOT5zki1OpI2SFXFZqj4xurWuf+5m+CmVO2/DN49Ch
/KEMUqBcgJbpcPvckhLXG/tV+/7AI9ApRhXN0Q4UcjJi+RwqPhYoYZshgcJPdrcLViTurXJNhdIx2Uw2
Rb2kVwx1Nv/mg6dmfyBiHGlsvZN4zpUYpKze9+JopXhvfTy7WMQ6UrLJcCizBo1Sz9LvZEzIhRjTa3RN
BXlSlrt/lDi+fYO3y3ACyhvHz6Q32u0T6yzD29goW7Gm/JKhjSprDK877TJeSmwBnck7l+BJAZ4YjR0a
PDR6BtbwGd0zXUwfOdIZX6PdS8BIQYq85XkA5QGtJ1pQUWuKlpXs0MqipeUJ1iOZqmVrqrcHa8hPDaEw
G7IRY8RIGZYhp/mNJIJQmA24ruDagusLThrU3gOtV+OofuWOcavO4t8s8lNDKMwGHOK4qOHCJl/c3h64
X5KkO0S2/40Czd+YEQefvqIj4QAAAABJRU5ErkJggg==
</value>
</data>
<data name="button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN
1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMZSURBVEhLzVdd
TxNBFF3/hi8+GH0xJmriq5HdzralCMKDGl/LxwMphCe+QqKBmCBB3oDAzyD8A4F+AfJATFRMoAhtUVrY
CqXajvcss2Ep07KlEDzJSSY7d+7p3Llz51b57zHvcj0M6vpgxOuNhD2eGI2NIGMGxmF8Y+ztHGMPhHl1
4IpyI6hpr0K6vhn1+fbX2tpyPwcGeHpoiGeGh01ijG/fW1uPyMYIu92xBZfrBdYKN5UhpGl3aVeflxoa
jGRfHz8cG3PEBNliTdDtXp1T1dvCnTOEVFWlXRqxjo68zLkTrgcCefig3T8VbsuDQltDCw4q2WUpYvfw
RTt/ItzLEa6puRdiLIMzkzm6COGLwr5PiXhHyJwGkoEydHWzq+vC4S3FWGfn34jHsyJNOLour1eamgzZ
wsvgp8ZGY0HXXwq5Y+CXhOgaJPv7pYvA3MwMz05MSOfA7OSkaSObA3HedNXWheQx5jTtcbSubl+2AMzN
znJeKPBCMmkKFM/jW2Fnx7SBbfG8RWgsqOojIUvXR9ffozjIjMHs+DjPx+McKOzu8uzU1MkcjfENgM0h
2drX2rnW0nJESfZOyFI2e73L5cJsUiJeiSiIKxqprY0KWRJ2u7dR+mTGp2gXT6dNAk5EwdTgIKebsyVk
KdSMZTMjI1LjM4Q4nbUFnLsTURAa0BKylQlnp6d5IZUSsiRMY/uZl+MZYQr1lpNQ20XziYRJoDjhSjFF
GqT1Q8gqCr2xyzvnJNcp0e3t4/Ai7DQGTHGyka21eCa58MB/bW4+khmDUlFr3i6OsJcR/+b3H9LVfSNk
qYBQ54BHXGYMXlYBod1mqDTfF7K2klnmKbySkgnMa9rzpfp64+DDB+nCagifiz5fhsrlMyF3AutZXK+i
6yjFjfb20s8iQJ3CLaql6XhPj9TBRRjv7uZ0jL8+MnZTyMhxLa2PBbPZY2xvIxAoecXOIzV7eIn2HDd7
Fq6lvbWAZLAaetxBKjK5RG+vWfp+j46axIuDnPji9+dgQ1emuoa+GLa/MIt4RoMu1x8Q46jXG73UvzBX
B0X5B56Fg+LhPgWxAAAAAElFTkSuQmCC
</value>
</data>
</root>

View File

@@ -645,6 +645,18 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnuserprocess;
private global::System.Data.DataColumn columnCMP_Background;
private global::System.Data.DataColumn columnCMP_Description;
private global::System.Data.DataColumn columnCMP_Before;
private global::System.Data.DataColumn columnCMP_After;
private global::System.Data.DataColumn columnbCost;
private global::System.Data.DataColumn columnbFanOut;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProjectsDataTable() :
@@ -983,6 +995,54 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_BackgroundColumn {
get {
return this.columnCMP_Background;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_DescriptionColumn {
get {
return this.columnCMP_Description;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_BeforeColumn {
get {
return this.columnCMP_Before;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_AfterColumn {
get {
return this.columnCMP_After;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn bCostColumn {
get {
return this.columnbCost;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn bFanOutColumn {
get {
return this.columnbFanOut;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1056,7 +1116,13 @@ namespace FPJ0000 {
string lasthistory,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
bool bCost,
bool bFanOut) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1095,7 +1161,13 @@ namespace FPJ0000 {
lasthistory,
gcode,
category,
userprocess};
userprocess,
CMP_Background,
CMP_Description,
CMP_Before,
CMP_After,
bCost,
bFanOut};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1138,7 +1210,13 @@ namespace FPJ0000 {
string lasthistory,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
bool bCost,
bool bFanOut) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1177,7 +1255,13 @@ namespace FPJ0000 {
lasthistory,
gcode,
category,
userprocess};
userprocess,
CMP_Background,
CMP_Description,
CMP_Before,
CMP_After,
bCost,
bFanOut};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1244,6 +1328,12 @@ namespace FPJ0000 {
this.columngcode = base.Columns["gcode"];
this.columncategory = base.Columns["category"];
this.columnuserprocess = base.Columns["userprocess"];
this.columnCMP_Background = base.Columns["CMP_Background"];
this.columnCMP_Description = base.Columns["CMP_Description"];
this.columnCMP_Before = base.Columns["CMP_Before"];
this.columnCMP_After = base.Columns["CMP_After"];
this.columnbCost = base.Columns["bCost"];
this.columnbFanOut = base.Columns["bFanOut"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1323,6 +1413,18 @@ namespace FPJ0000 {
base.Columns.Add(this.columncategory);
this.columnuserprocess = new global::System.Data.DataColumn("userprocess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnuserprocess);
this.columnCMP_Background = new global::System.Data.DataColumn("CMP_Background", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Background);
this.columnCMP_Description = new global::System.Data.DataColumn("CMP_Description", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Description);
this.columnCMP_Before = new global::System.Data.DataColumn("CMP_Before", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Before);
this.columnCMP_After = new global::System.Data.DataColumn("CMP_After", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_After);
this.columnbCost = new global::System.Data.DataColumn("bCost", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbCost);
this.columnbFanOut = new global::System.Data.DataColumn("bFanOut", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbFanOut);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1361,6 +1463,10 @@ namespace FPJ0000 {
this.columngcode.MaxLength = 10;
this.columncategory.MaxLength = 50;
this.columnuserprocess.MaxLength = 100;
this.columnCMP_Background.MaxLength = 2147483647;
this.columnCMP_Description.MaxLength = 2147483647;
this.columnCMP_Before.MaxLength = 2147483647;
this.columnCMP_After.MaxLength = 2147483647;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5811,6 +5917,102 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Background {
get {
if (this.IsCMP_BackgroundNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_BackgroundColumn]));
}
}
set {
this[this.tableProjects.CMP_BackgroundColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Description {
get {
if (this.IsCMP_DescriptionNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_DescriptionColumn]));
}
}
set {
this[this.tableProjects.CMP_DescriptionColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Before {
get {
if (this.IsCMP_BeforeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_BeforeColumn]));
}
}
set {
this[this.tableProjects.CMP_BeforeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_After {
get {
if (this.IsCMP_AfterNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_AfterColumn]));
}
}
set {
this[this.tableProjects.CMP_AfterColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool bCost {
get {
if (this.IsbCostNull()) {
return false;
}
else {
return ((bool)(this[this.tableProjects.bCostColumn]));
}
}
set {
this[this.tableProjects.bCostColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool bFanOut {
get {
if (this.IsbFanOutNull()) {
return false;
}
else {
return ((bool)(this[this.tableProjects.bFanOutColumn]));
}
}
set {
this[this.tableProjects.bFanOutColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsnameNull() {
@@ -6206,6 +6408,78 @@ namespace FPJ0000 {
public void SetuserprocessNull() {
this[this.tableProjects.userprocessColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_BackgroundNull() {
return this.IsNull(this.tableProjects.CMP_BackgroundColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_BackgroundNull() {
this[this.tableProjects.CMP_BackgroundColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_DescriptionNull() {
return this.IsNull(this.tableProjects.CMP_DescriptionColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_DescriptionNull() {
this[this.tableProjects.CMP_DescriptionColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_BeforeNull() {
return this.IsNull(this.tableProjects.CMP_BeforeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_BeforeNull() {
this[this.tableProjects.CMP_BeforeColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_AfterNull() {
return this.IsNull(this.tableProjects.CMP_AfterColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_AfterNull() {
this[this.tableProjects.CMP_AfterColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsbCostNull() {
return this.IsNull(this.tableProjects.bCostColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetbCostNull() {
this[this.tableProjects.bCostColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsbFanOutNull() {
return this.IsNull(this.tableProjects.bFanOutColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetbFanOutNull() {
this[this.tableProjects.bFanOutColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -9562,6 +9836,12 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("category", "category");
tableMapping.ColumnMappings.Add("userprocess", "userprocess");
tableMapping.ColumnMappings.Add("CMP_Background", "CMP_Background");
tableMapping.ColumnMappings.Add("CMP_Description", "CMP_Description");
tableMapping.ColumnMappings.Add("CMP_Before", "CMP_Before");
tableMapping.ColumnMappings.Add("CMP_After", "CMP_After");
tableMapping.ColumnMappings.Add("bCost", "bCost");
tableMapping.ColumnMappings.Add("bFanOut", "bFanOut");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -9572,8 +9852,8 @@ namespace FPJ0000.dsPRJTableAdapters {
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects
(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess);
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut);
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '' THEN '0' WHEN ([status] = '') THEN '1' WHEN ([status] = '') THEN '2' WHEN ([status] = '') THEN '3' WHEN ([status] = '') THEN '9' ELSE '5' END)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9610,13 +9890,20 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
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("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", 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 Projects
SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo,
wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt,
remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2,
orderno = @orderno, category = @category, userprocess = @userprocess
orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before,
CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut
WHERE (idx = @Original_idx);
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '' THEN '0' WHEN ([status] = '') THEN '1' WHEN ([status] = '') THEN '2' WHEN ([status] = '') THEN '3' WHEN ([status] = '') THEN '9' ELSE '5' END)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
@@ -9653,6 +9940,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", 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, "", "", ""));
}
@@ -9671,7 +9964,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -9690,7 +9984,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -9698,7 +9993,8 @@ WHERE (idx = @idx)";
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search OR
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)";
@@ -9930,7 +10226,13 @@ WHERE (ISNULL(name, N'') LIKE @search OR
string orderno,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
global::System.Nullable<bool> bCost,
global::System.Nullable<bool> bFanOut) {
if ((status == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -10130,6 +10432,42 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.InsertCommand.Parameters[33].Value = ((string)(userprocess));
}
if ((CMP_Background == null)) {
this.Adapter.InsertCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[34].Value = ((string)(CMP_Background));
}
if ((CMP_Description == null)) {
this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[35].Value = ((string)(CMP_Description));
}
if ((CMP_Before == null)) {
this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[36].Value = ((string)(CMP_Before));
}
if ((CMP_After == null)) {
this.Adapter.InsertCommand.Parameters[37].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[37].Value = ((string)(CMP_After));
}
if ((bCost.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[38].Value = ((bool)(bCost.Value));
}
else {
this.Adapter.InsertCommand.Parameters[38].Value = global::System.DBNull.Value;
}
if ((bFanOut.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[39].Value = ((bool)(bFanOut.Value));
}
else {
this.Adapter.InsertCommand.Parameters[39].Value = global::System.DBNull.Value;
}
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)) {
@@ -10184,6 +10522,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
string orderno,
string category,
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
global::System.Nullable<bool> bCost,
global::System.Nullable<bool> bFanOut,
int Original_idx,
int idx) {
if ((status == null)) {
@@ -10379,8 +10723,44 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(userprocess));
}
this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(idx));
if ((CMP_Background == null)) {
this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(CMP_Background));
}
if ((CMP_Description == null)) {
this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(CMP_Description));
}
if ((CMP_Before == null)) {
this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(CMP_Before));
}
if ((CMP_After == null)) {
this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(CMP_After));
}
if ((bCost.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[37].Value = ((bool)(bCost.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
}
if ((bFanOut.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[38].Value = ((bool)(bFanOut.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[40].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)) {

View File

@@ -24,8 +24,8 @@ WHERE (idx = @Original_idx)</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO Projects
(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess);
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut);
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -62,13 +62,20 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" 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="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -88,7 +95,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo,
wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt,
remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2,
orderno = @orderno, category = @category, userprocess = @userprocess
orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before,
CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut
WHERE (idx = @Original_idx);
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
<Parameters>
@@ -125,6 +133,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
<Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" 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="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
@@ -169,6 +183,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="category" DataSetColumn="category" />
<Mapping SourceColumn="userprocess" DataSetColumn="userprocess" />
<Mapping SourceColumn="CMP_Background" DataSetColumn="CMP_Background" />
<Mapping SourceColumn="CMP_Description" DataSetColumn="CMP_Description" />
<Mapping SourceColumn="CMP_Before" DataSetColumn="CMP_Before" />
<Mapping SourceColumn="CMP_After" DataSetColumn="CMP_After" />
<Mapping SourceColumn="bCost" DataSetColumn="bCost" />
<Mapping SourceColumn="bFanOut" DataSetColumn="bFanOut" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
@@ -192,7 +212,8 @@ WHERE (import = 1) AND (gcode = @gcode)</CommandText>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (idx = @idx)</CommandText>
<Parameters>
@@ -205,7 +226,8 @@ WHERE (idx = @idx)</CommandText>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search OR
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)</CommandText>
@@ -1476,6 +1498,36 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CMP_Background" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Background" msprop:Generator_ColumnVarNameInTable="columnCMP_Background" msprop:Generator_ColumnPropNameInTable="CMP_BackgroundColumn" msprop:Generator_UserColumnName="CMP_Background" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CMP_Description" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Description" msprop:Generator_ColumnVarNameInTable="columnCMP_Description" msprop:Generator_ColumnPropNameInTable="CMP_DescriptionColumn" msprop:Generator_UserColumnName="CMP_Description" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CMP_Before" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Before" msprop:Generator_ColumnVarNameInTable="columnCMP_Before" msprop:Generator_ColumnPropNameInTable="CMP_BeforeColumn" msprop:Generator_UserColumnName="CMP_Before" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CMP_After" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_After" msprop:Generator_ColumnVarNameInTable="columnCMP_After" msprop:Generator_ColumnPropNameInTable="CMP_AfterColumn" msprop:Generator_UserColumnName="CMP_After" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="bCost" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bCost" msprop:Generator_ColumnVarNameInTable="columnbCost" msprop:Generator_ColumnPropNameInTable="bCostColumn" msprop:Generator_UserColumnName="bCost" type="xs:boolean" minOccurs="0" />
<xs:element name="bFanOut" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bFanOut" msprop:Generator_ColumnVarNameInTable="columnbFanOut" msprop:Generator_ColumnPropNameInTable="bFanOutColumn" msprop:Generator_UserColumnName="bFanOut" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>