Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpate login.html

Browse Source
This commit is contained in:
backuppc
2025-07-10 14:36:05 +09:00
parent 43526a26ec
commit 26cb328f8f
31 changed files with 866 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SubProject/FBS0000/FBS0000.csproj
View File

@@ -38,10 +38,6 @@
<Reference Include="arCommUtil">
<HintPath>..\..\DLL\arCommUtil.dll</HintPath>
</Reference>
<Reference Include="arControl.Net4, Version=18.7.27.1500, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Sub\arCtl\bin\debug\arControl.Net4.dll</HintPath>
</Reference>
<Reference Include="ArSetting.Net4">
<HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
</Reference>
@@ -322,6 +318,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Sub\arCtl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\FCM0000\FCM0000.csproj">
<Project>{26982882-c1ff-45f8-861c-d67558725ff1}</Project>
<Name>FCM0000</Name>

151
SubProject/FCOMMON/DataBaseManager.cs
View File

@@ -4,6 +4,8 @@ using System.Linq;
using System.Text;
using System.Data.SqlClient;
using System.Windows.Forms;
using FCOMMON.Models;
using System.Data;
namespace FCOMMON
{
@@ -17,21 +19,124 @@ namespace FCOMMON
return cn;
}
public struct sItemInfo
public static UserModel GetUserInfo(string uid)
{
public int idx;
public string sid;
public string model;
public string supply;
public string name;
public string unit;
public float scale;
public string price;
public int supplyidx;
public string project;
public int qty;
var retval = new UserModel();
var cn = getCn();
var sql = "select * from Users where id = @id";
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
cmd.Parameters.Add("id", SqlDbType.VarChar).Value = uid;
cn.Open();
var rdr = cmd.ExecuteReader();
var cnt = 0;
while (rdr.Read())
{
retval.name = rdr["name"].ToString();
retval.password = rdr["password"].ToString();
retval.id = rdr["id"].ToString();
retval.email = rdr["email"].ToString();
retval.hp = rdr["email"].ToString();
retval.tel = rdr["tel"].ToString();
retval.grade = rdr["grade"].ToString();
cnt += 1;
}
cn.Dispose();
if (cnt == 0) return null;
return retval;
}
public static UserGroupModel GetUserGroup(string gcode)
{
var retval = new UserGroupModel();
var cn = getCn();
var sql = "select * from UserGroup where gcode = @gcode";
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode;
cn.Open();
var rdr = cmd.ExecuteReader();
var cnt = 0;
while (rdr.Read())
{
retval.gcode = rdr["gcode"].ToString();
retval.name = rdr["dept"].ToString();
cnt += 1;
}
cn.Dispose();
if (cnt == 0) return null;
return retval;
}
/// <summary>
/// 입력된 id의 그룹정보를 반환
/// </summary>
/// <param name="gcode"></param>
/// <param name="uid"></param>
/// <returns></returns>
public static GroupUserModel GetGroupUser(string gcode, string uid)
{
var retval = new GroupUserModel();
var cn = getCn();
var sql = "select * from EETGW_GroupUser where gcode = @gcode and uid = @uid";
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("uid", SqlDbType.VarChar).Value = uid;
cn.Open();
var rdr = cmd.ExecuteReader();
var cnt = 0;
while (rdr.Read())
{
retval.Gcode = rdr["gcode"].ToString();
retval.uid = rdr["uid"].ToString();
retval.level = int.Parse(rdr["level"]?.ToString() ?? "0");
retval.Process = rdr["Process"].ToString();
cnt += 1;
}
cn.Dispose();
if (cnt == 0) return null;
return retval;
}
public static List<UserGroupModel> GetUserGroups()
{
var cn = getCn();
cn.Open();
List<UserGroupModel> retval = new List<UserGroupModel>();
var sql = " select gcode,dept,permission,managerinfo,devinfo,usemail" +
" from UserGroup " +
" order by usemail desc,dept";
var cmd = new SqlCommand(sql, cn);
try
{
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
retval.Add(new UserGroupModel
{
gcode = rdr["gcode"]?.ToString() ?? string.Empty,
name = rdr["dept"]?.ToString() ?? string.Empty,
perm = int.Parse(rdr["permission"]?.ToString() ?? "0"),
});
}
}
catch
{
}
cn.Close();
cn.Dispose();
return retval;
}
public static List<string> GetItemStorageList()
{
@@ -489,12 +594,12 @@ namespace FCOMMON
}
public static sItemInfo getLastPurchaseInfo(int idx)
public static ItemModel getLastPurchaseInfo(int idx)
{
var cn = getCn();
cn.Open();
var retval = new sItemInfo();
var retval = new ItemModel();
retval.idx = -1;
string sql = "select isnull(max(idx),-1) from Purchase where pumidx = " + idx.ToString();
@@ -530,12 +635,12 @@ namespace FCOMMON
return retval;
}
public static sItemInfo getLastPurchaseCRInfo(int idx)
public static ItemModel getLastPurchaseCRInfo(int idx)
{
var cn = getCn();
cn.Open();
var retval = new sItemInfo();
var retval = new ItemModel();
retval.idx = -1;
string sql = "select isnull(max(idx),-1) from EETGW_PurchaseCR WITH (nolock) where pumidx = " + idx.ToString();
@@ -679,12 +784,12 @@ namespace FCOMMON
return cnt == 1;
}
public static sItemInfo getItemInfo(int idx)
public static ItemModel getItemInfo(int idx)
{
var cn = getCn();
cn.Open();
var retval = new sItemInfo();
var retval = new ItemModel();
retval.idx = -1;
string sql = "select * from Items WITH (nolock) where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString();
@@ -709,7 +814,7 @@ namespace FCOMMON
cn.Dispose();
return retval;
}
public static int addItemInfo(sItemInfo info)
public static int addItemInfo(ItemModel info)
{
int retval = -1;
var cn = getCn();
@@ -748,12 +853,12 @@ namespace FCOMMON
cn.Dispose();
return retval;
}
public static sItemInfo getItemInfo(string sid)
public static ItemModel getItemInfo(string sid)
{
var cn = getCn();
cn.Open();
var retval = new sItemInfo();
var retval = new ItemModel();
retval.idx = -1;
string sql = "select * from Items WITH (nolock) where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'";
@@ -796,7 +901,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var retval = new sItemInfo();
var retval = new ItemModel();
retval.idx = -1;
string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,isnull([dept],'') as dept,isnull(grade,'') as grade," +
@@ -908,7 +1013,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')"+
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and svalue = '{1}'";

11
SubProject/FCOMMON/FCOMMON.csproj
View File

@@ -36,9 +36,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="arControl.Net4">
<HintPath>..\..\Sub\arCtl\obj\Debug\arControl.Net4.dll</HintPath>
</Reference>
<Reference Include="ArSetting.Net4">
<HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
</Reference>
@@ -176,6 +173,10 @@
<Compile Include="IMyContract.cs" />
<Compile Include="ISO8601.cs" />
<Compile Include="keyValuedataTable.cs" />
<Compile Include="Models\GroupUserModel.cs" />
<Compile Include="Models\ItemModel.cs" />
<Compile Include="Models\UserModel.cs" />
<Compile Include="Models\UserGroupModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Info.cs" />
<Compile Include="Setting.cs" />
@@ -245,6 +246,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Sub\arCtl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\..\Sub\arftp\FTPClass.csproj">
<Project>{150859d3-1c5d-4e20-b324-f9ebe188d893}</Project>
<Name>FTPClass</Name>

12
SubProject/FCOMMON/Models/GroupUserModel.cs Normal file
View File

@@ -0,0 +1,12 @@
namespace FCOMMON.Models
{
public class GroupUserModel
{
public string Gcode { get; set; }
public string uid { get; set; }
public string Process { get; set; }
public int level { get; set; }
}
}

17
SubProject/FCOMMON/Models/ItemModel.cs Normal file
View File

@@ -0,0 +1,17 @@
namespace FCOMMON.Models
{
public class ItemModel
{
public int idx;
public string sid;
public string model;
public string supply;
public string name;
public string unit;
public float scale;
public string price;
public int supplyidx;
public string project;
public int qty;
}
}

9
SubProject/FCOMMON/Models/UserGroupModel.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace FCOMMON.Models
{
public class UserGroupModel
{
public string gcode { get; set; }
public string name { get; set; }
public int perm { get; set; }
}
}

19
SubProject/FCOMMON/Models/UserModel.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FCOMMON.Models
{
public class UserModel
{
public string id { get; set; }
public string password { get; set; }
public string name { get; set; }
public string grade { get; set; }
public string email { get; set; }
public string hp { get; set; }
public string tel { get; set; }
}
}

2
SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
View File

@@ -635,7 +635,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs
View File

@@ -170,7 +170,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs
View File

@@ -580,7 +580,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs
View File

@@ -163,7 +163,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs
View File

@@ -654,7 +654,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs
View File

@@ -169,7 +169,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

2
SubProject/FEQ0000/fPurchaseConfirm.cs
View File

@@ -469,7 +469,7 @@ namespace FEQ0000
var iteminfo = FCOMMON.DBM.getItemInfo(sid);
if (iteminfo.idx < 0)
{
FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
FCOMMON.Models.ItemModel newitem = new FCOMMON.Models.ItemModel();
newitem.sid = newdr.sid;
newitem.name = newdr.pumname;
newitem.price = newdr.pumprice.ToString();

105
SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs generated
View File

@@ -30,16 +30,16 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = 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 FPJ0000.dsPRJ();
@@ -100,6 +100,8 @@
this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.목록내보내기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -110,6 +112,7 @@
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// bn
@@ -511,6 +514,7 @@
this.otEnd,
this.projectNameDataGridViewTextBoxColumn,
this.descriptionDataGridViewTextBoxColumn});
this.dv1.ContextMenuStrip = this.contextMenuStrip1;
this.dv1.DataSource = this.bs;
this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
@@ -553,9 +557,9 @@
// wwDataGridViewTextBoxColumn
//
this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11;
this.wwDataGridViewTextBoxColumn.HeaderText = "WW";
this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn";
this.wwDataGridViewTextBoxColumn.ReadOnly = true;
@@ -564,8 +568,8 @@
// pdateDataGridViewTextBoxColumn
//
this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12;
this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜";
this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
@@ -574,8 +578,8 @@
// WeekName
//
this.WeekName.DataPropertyName = "WeekName";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.WeekName.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.WeekName.DefaultCellStyle = dataGridViewCellStyle13;
this.WeekName.HeaderText = "*";
this.WeekName.Name = "WeekName";
this.WeekName.ReadOnly = true;
@@ -616,8 +620,8 @@
// statusDataGridViewTextBoxColumn
//
this.statusDataGridViewTextBoxColumn.DataPropertyName = "status";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14;
this.statusDataGridViewTextBoxColumn.HeaderText = "상태";
this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn";
this.statusDataGridViewTextBoxColumn.ReadOnly = true;
@@ -634,11 +638,11 @@
// otDataGridViewTextBoxColumn
//
this.otDataGridViewTextBoxColumn.DataPropertyName = "ot";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle5.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle15.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15;
this.otDataGridViewTextBoxColumn.HeaderText = "초과";
this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn";
this.otDataGridViewTextBoxColumn.ReadOnly = true;
@@ -647,10 +651,10 @@
// ot2DataGridViewTextBoxColumn
//
this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle16.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle16;
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인(대체)";
this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn";
this.ot2DataGridViewTextBoxColumn.Width = 88;
@@ -658,10 +662,10 @@
// otPMS
//
this.otPMS.DataPropertyName = "otPMS";
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle7.Format = "N1";
this.otPMS.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle17.Format = "N1";
this.otPMS.DefaultCellStyle = dataGridViewCellStyle17;
this.otPMS.HeaderText = "승인(PMS)";
this.otPMS.Name = "otPMS";
this.otPMS.Width = 91;
@@ -669,8 +673,8 @@
// otReasonDataGridViewTextBoxColumn
//
this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason";
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle18;
this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유";
this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn";
this.otReasonDataGridViewTextBoxColumn.Width = 54;
@@ -678,10 +682,10 @@
// otStartDataGridViewTextBoxColumn
//
this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart";
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle9.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle19.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19;
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
@@ -690,10 +694,10 @@
// otEnd
//
this.otEnd.DataPropertyName = "otEnd";
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle10.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle20.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle20;
this.otEnd.HeaderText = "종료";
this.otEnd.Name = "otEnd";
this.otEnd.ReadOnly = true;
@@ -715,6 +719,20 @@
this.descriptionDataGridViewTextBoxColumn.ReadOnly = true;
this.descriptionDataGridViewTextBoxColumn.Width = 51;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.목록내보내기ToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(153, 48);
//
// 목록내보내기ToolStripMenuItem
//
this.목록내보내기ToolStripMenuItem.Name = "목록내보내기ToolStripMenuItem";
this.목록내보내기ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.목록내보내기ToolStripMenuItem.Text = "목록 내보내기";
this.목록내보내기ToolStripMenuItem.Click += new System.EventHandler(this.목록내보내기ToolStripMenuItem_Click);
//
// fOTConfirm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -739,6 +757,7 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -806,5 +825,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn otEnd;
private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem 목록내보내기ToolStripMenuItem;
}
}

40
SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
View File

@@ -43,7 +43,7 @@ namespace FPJ0000
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
//공정목록
// var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
// var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = FCOMMON.DBM.GroupUserProcessList();//taProc.GetData(FCOMMON.info.Login.gcode);
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm));
//cmbProcess.Items.Clear();
@@ -138,7 +138,7 @@ namespace FPJ0000
{
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.name))
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
@@ -150,7 +150,7 @@ namespace FPJ0000
{
var processStr = prc;// cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.name))
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
@@ -296,7 +296,7 @@ namespace FPJ0000
}
private void toolStripLabel3_Click(object sender, EventArgs e)
{
//사용자목록처리
@@ -348,7 +348,7 @@ namespace FPJ0000
if (e.KeyCode == Keys.Enter) btFind.PerformClick();
}
private void lbStt_Click(object sender, EventArgs e)
{
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
@@ -413,7 +413,7 @@ namespace FPJ0000
private void toolStripButton1_Click(object sender, EventArgs e)
{
//전체승인
using(var f = new fOTConfirmValue())
using (var f = new fOTConfirmValue())
{
if (f.ShowDialog() != DialogResult.OK) return;
}
@@ -469,7 +469,7 @@ namespace FPJ0000
{
if (f.ShowDialog() == DialogResult.OK)
{
foreach(var row in rows)
foreach (var row in rows)
row.EndEdit();
try
@@ -492,8 +492,8 @@ namespace FPJ0000
}
}
private void toolStripButton8_Click(object sender, EventArgs e)
{
private void toolStripButton8_Click(object sender, EventArgs e)
{
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
@@ -501,8 +501,8 @@ namespace FPJ0000
dtED.Text = ed.ToShortDateString();
}
private void toolStripButton7_Click(object sender, EventArgs e)
{
private void toolStripButton7_Click(object sender, EventArgs e)
{
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
@@ -514,5 +514,23 @@ namespace FPJ0000
{
}
private void 목록내보내기ToolStripMenuItem_Click(object sender, EventArgs e)
{
using (var sd = new SaveFileDialog())
{
sd.Filter = "콤마로 분리된 파일|*.csv";
sd.FilterIndex = 0;
if (sd.ShowDialog() != DialogResult.OK) return;
var fn = dv1.ExportData(sd.FileName);
var dlg = AR.UTIL.MsgQ("생성된 파일을 확인할까요?");
if (dlg != DialogResult.Yes) return;
AR.UTIL.RunExplorer(fn);
}
}
}
}

6
SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
View File

@@ -227,6 +227,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>325, 17</value>
</metadata>
@@ -316,6 +319,9 @@
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 17</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>252, 17</value>
</metadata>

4
SubProject/FPM0000/FPM0000.csproj
View File

@@ -127,6 +127,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Sub\arCtl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\FCM0000\FCM0000.csproj">
<Project>{26982882-c1ff-45f8-861c-d67558725ff1}</Project>
<Name>FCM0000</Name>