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

..

Browse Source
This commit is contained in:
chikyun.kim
2018-12-08 15:12:15 +09:00
parent 3f68c3c5e8
commit 43841e6c52
43 changed files with 6312 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Project/EETGW.csproj
View File

@@ -223,12 +223,6 @@
<Compile Include="fMain.Designer.cs">
<DependentUpon>fMain.cs</DependentUpon>
</Compile>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="fSetting.cs">
<SubType>Form</SubType>
</Compile>
@@ -318,9 +312,6 @@
<EmbeddedResource Include="fMain.resx">
<DependentUpon>fMain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="fSetting.resx">
<DependentUpon>fSetting.cs</DependentUpon>
</EmbeddedResource>

26
Project/History.txt
View File

@@ -1,4 +1,28 @@
181031 chi 구매 - 프로젝트 검색시 유사 검색 기능이 되도록 수정
181207 chi 업체정보화면 에 담당자 목록 추가
업체대표 및 담당자 테이블 데이터 추가
품목에 이미지 확인 사항 추가
품목 검색창에서 이미지 확인 및 추가 가능
181205 chi 메뉴한글과
업체정보 업데이트 (양진원)
업체정보 열너비 저장 가능
181203 chi 구매 - 상태검색 기능 활성
일반 - 시작화면 선택 기능
프로그램설정 - 처음 실행 화면 설정가능
구매목록 - 상태 검색 기능 사용 가능
구매목록 - 데이터 복사시 추가정보 및 상태 초기화
구매목록 - 본인외 및 SC자료 삭제 불가
구매추가 - 본인 자료 만 편집 가능
구매추가 - 입고예정일을 좌측 그룹으로 이동
구매추가 - 입력자 못 고침
구매추가 - 상태창 값이 맞지 않는 현상 수정
구매추가 - 공정 자동 불러오도록 함
구매추가 - 합계에 천단위 구분기호(콤마) 표시
구매추가 - 화면 한글 화
구매추가 - SC 값이 있으면 일반 사용자는 편집 불가
구매추가 - 견적서 폴더 열기 기능 추가(공유폴더연결)
181031 chi 구매 - 프로젝트 검색시 유사 검색 기능이 되도록 수정
181030 chi 구매시 - 서플라이 검색 기능 추가됨, 날짜 입력 편하게 됨
indate 가 자동 활성화되는 현상 수정
181023 chi getAuth_Purchase, 추가

4
Project/Properties/AssemblyInfo.cs
View File

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

26
Project/Setting.cs
View File

@@ -6,6 +6,11 @@ using System.ComponentModel;
namespace Project
{
public enum eFormList
{
없음=0,
NR구매관리,
}
public class Setting : arUtil.Setting
{
#region "log"
@@ -14,6 +19,12 @@ namespace Project
public Boolean Log_IO { get; set; }
#endregion
[Description("시작 화면")]
public eFormList startForm { get; set; }
[Description("중복으로 창을 열수 있습니다")]
public Boolean DupWindow { get; set; }
[Description("Password for Setting")]
[Browsable(false)]
@@ -54,6 +65,21 @@ namespace Project
if (Language.isEmpty()) Language = "Kor";
if (Password_Setup.isEmpty()) Password_Setup = "0000";
if (Password_User.isEmpty()) Password_User = "9999";
//시작폼가져오기
var 시작품 = Xml.get_Data("startForm");
var list = Enum.GetNames(typeof(eFormList));
int idx = -1;
for(int i = 0 ;i<list.Length;i++)
{
if(list[i] == 시작품)
{
idx = i;
}
}
if (idx == -1) this.startForm = eFormList.없음;
else this.startForm = (eFormList)idx;
}
public override void AfterSave()
{

237
Project/fMain.Designer.cs generated
View File

@@ -53,14 +53,15 @@
this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lineCodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aDSUserListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lineCodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.boardsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -75,8 +76,6 @@
this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.nRPurchaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.staffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.windowsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.cascadeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tileVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -86,6 +85,7 @@
this.btDev = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
@@ -190,20 +190,22 @@
//
this.btSetting.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.btSetting.Name = "btSetting";
this.btSetting.Size = new System.Drawing.Size(57, 20);
this.btSetting.Text = "Setting";
this.btSetting.Size = new System.Drawing.Size(49, 23);
this.btSetting.Text = "설정";
this.btSetting.Click += new System.EventHandler(this.settingToolStripMenuItem_Click);
//
// btLog
//
this.btLog.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.btLog.ForeColor = System.Drawing.Color.DimGray;
this.btLog.Name = "btLog";
this.btLog.Size = new System.Drawing.Size(39, 20);
this.btLog.Text = "Log";
this.btLog.Size = new System.Drawing.Size(105, 23);
this.btLog.Text = "프로그램기록";
this.btLog.Click += new System.EventHandler(this.logToolStripMenuItem_Click);
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btSetting,
this.btLog,
@@ -211,13 +213,12 @@
this.commonToolStripMenuItem,
this.boardsToolStripMenuItem,
this.managementToolStripMenuItem,
this.infoToolStripMenuItem,
this.windowsMenu,
this.btDev});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
this.menuStrip1.MdiWindowListItem = this.windowsMenu;
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1035, 24);
this.menuStrip1.Size = new System.Drawing.Size(1035, 27);
this.menuStrip1.TabIndex = 29;
this.menuStrip1.Text = "menuStrip1";
//
@@ -227,21 +228,22 @@
this.listToolStripMenuItem,
this.workReportToolStripMenuItem});
this.projectToolStripMenuItem.Name = "projectToolStripMenuItem";
this.projectToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
this.projectToolStripMenuItem.Text = "Project";
this.projectToolStripMenuItem.Size = new System.Drawing.Size(77, 23);
this.projectToolStripMenuItem.Text = "프로젝트";
//
// listToolStripMenuItem
//
this.listToolStripMenuItem.Name = "listToolStripMenuItem";
this.listToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.listToolStripMenuItem.Text = "List";
this.listToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.listToolStripMenuItem.Text = "목록";
this.listToolStripMenuItem.Click += new System.EventHandler(this.listToolStripMenuItem_Click);
//
// workReportToolStripMenuItem
//
this.workReportToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.workReportToolStripMenuItem.Name = "workReportToolStripMenuItem";
this.workReportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.workReportToolStripMenuItem.Text = "Work_Report";
this.workReportToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.workReportToolStripMenuItem.Text = "업무일지";
this.workReportToolStripMenuItem.Click += new System.EventHandler(this.workReportToolStripMenuItem_Click);
//
// commonToolStripMenuItem
@@ -249,43 +251,30 @@
this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.itemsToolStripMenuItem,
this.codesToolStripMenuItem,
this.lineCodeToolStripMenuItem,
this.staffGridToolStripMenuItem,
this.userInfoToolStripMenuItem,
this.mailFormToolStripMenuItem,
this.customerToolStripMenuItem});
this.customerToolStripMenuItem,
this.lineCodeToolStripMenuItem,
this.toolStripMenuItem1,
this.staffGridToolStripMenuItem,
this.mailFormToolStripMenuItem});
this.commonToolStripMenuItem.Name = "commonToolStripMenuItem";
this.commonToolStripMenuItem.Size = new System.Drawing.Size(70, 20);
this.commonToolStripMenuItem.Text = "Common";
this.commonToolStripMenuItem.Size = new System.Drawing.Size(77, 23);
this.commonToolStripMenuItem.Text = "공용정보";
//
// itemsToolStripMenuItem
//
this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.itemsToolStripMenuItem.Text = "Items";
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.itemsToolStripMenuItem.Text = "품목";
this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
//
// codesToolStripMenuItem
//
this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
this.codesToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.codesToolStripMenuItem.Text = "Codes";
this.codesToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.codesToolStripMenuItem.Text = "공용코드";
this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
//
// lineCodeToolStripMenuItem
//
this.lineCodeToolStripMenuItem.Name = "lineCodeToolStripMenuItem";
this.lineCodeToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.lineCodeToolStripMenuItem.Text = "Line Code";
this.lineCodeToolStripMenuItem.Click += new System.EventHandler(this.lineCodeToolStripMenuItem_Click);
//
// staffGridToolStripMenuItem
//
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
// userInfoToolStripMenuItem
//
this.userInfoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -293,46 +282,67 @@
this.myAccouserToolStripMenuItem,
this.aDSUserListToolStripMenuItem});
this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.userInfoToolStripMenuItem.Text = "User Info";
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.userInfoToolStripMenuItem.Text = "사용자";
this.userInfoToolStripMenuItem.Click += new System.EventHandler(this.userInfoToolStripMenuItem_Click);
//
// userAccountToolStripMenuItem
//
this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem";
this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.userAccountToolStripMenuItem.Text = "User Account";
this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.userAccountToolStripMenuItem.Text = "계정정보";
this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click);
//
// myAccouserToolStripMenuItem
//
this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem";
this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.myAccouserToolStripMenuItem.Text = "User List";
this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.myAccouserToolStripMenuItem.Text = "목록";
this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click);
//
// aDSUserListToolStripMenuItem
//
this.aDSUserListToolStripMenuItem.ForeColor = System.Drawing.Color.Blue;
this.aDSUserListToolStripMenuItem.Name = "aDSUserListToolStripMenuItem";
this.aDSUserListToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.aDSUserListToolStripMenuItem.Text = "User List(ADS)";
this.aDSUserListToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.aDSUserListToolStripMenuItem.Text = "목록(AD)";
this.aDSUserListToolStripMenuItem.Click += new System.EventHandler(this.aDSUserListToolStripMenuItem_Click);
//
// mailFormToolStripMenuItem
//
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.mailFormToolStripMenuItem.Text = "Mail Form";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
//
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.customerToolStripMenuItem.Text = "Customer";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// lineCodeToolStripMenuItem
//
this.lineCodeToolStripMenuItem.Name = "lineCodeToolStripMenuItem";
this.lineCodeToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.lineCodeToolStripMenuItem.Text = "라인코드";
this.lineCodeToolStripMenuItem.Click += new System.EventHandler(this.lineCodeToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(153, 6);
//
// staffGridToolStripMenuItem
//
this.staffGridToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
// mailFormToolStripMenuItem
//
this.mailFormToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(156, 24);
this.mailFormToolStripMenuItem.Text = "메일 양식";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
//
// boardsToolStripMenuItem
//
this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -343,49 +353,52 @@
this.bugReportToolStripMenuItem,
this.todoListToolStripMenuItem});
this.boardsToolStripMenuItem.Name = "boardsToolStripMenuItem";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
this.boardsToolStripMenuItem.Text = "Boards";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.boardsToolStripMenuItem.Text = "문서";
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.minutesToolStripMenuItem.Text = "Minutes";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
//
// holidayToolStripMenuItem
//
this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.holidayToolStripMenuItem.Text = "holiday";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.holidayToolStripMenuItem.Text = "휴가";
this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
//
// requestITemToolStripMenuItem
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.requestITemToolStripMenuItem.Text = "Request Item";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
//
// freeBoardToolStripMenuItem
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
//
// bugReportToolStripMenuItem
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
//
// todoListToolStripMenuItem
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
//
// managementToolStripMenuItem
@@ -395,8 +408,8 @@
this.personalInventoryToolStripMenuItem,
this.nRPurchaseToolStripMenuItem});
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(90, 20);
this.managementToolStripMenuItem.Text = "Management";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.managementToolStripMenuItem.Text = "관리";
//
// equipmentToolStripMenuItem
//
@@ -405,59 +418,46 @@
this.dataMoldEOLToolStripMenuItem,
this.dataToolStripMenuItem});
this.equipmentToolStripMenuItem.Name = "equipmentToolStripMenuItem";
this.equipmentToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
this.equipmentToolStripMenuItem.Text = "Equipment";
this.equipmentToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.equipmentToolStripMenuItem.Text = "장비 목록";
this.equipmentToolStripMenuItem.Click += new System.EventHandler(this.equipmentToolStripMenuItem_Click);
//
// dataFOLToolStripMenuItem
//
this.dataFOLToolStripMenuItem.Name = "dataFOLToolStripMenuItem";
this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.dataFOLToolStripMenuItem.Text = "FOL";
this.dataFOLToolStripMenuItem.Click += new System.EventHandler(this.dataFOLToolStripMenuItem_Click);
//
// dataMoldEOLToolStripMenuItem
//
this.dataMoldEOLToolStripMenuItem.Name = "dataMoldEOLToolStripMenuItem";
this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.dataMoldEOLToolStripMenuItem.Text = "MOLD & EOL";
this.dataMoldEOLToolStripMenuItem.Click += new System.EventHandler(this.dataMoldEOLToolStripMenuItem_Click);
//
// dataToolStripMenuItem
//
this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
this.dataToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.dataToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.dataToolStripMenuItem.Text = "BUMP";
this.dataToolStripMenuItem.Click += new System.EventHandler(this.dataToolStripMenuItem_Click);
//
// personalInventoryToolStripMenuItem
//
this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
this.personalInventoryToolStripMenuItem.Text = "Personal Inventory";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.personalInventoryToolStripMenuItem.Text = "개인별 물품";
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// nRPurchaseToolStripMenuItem
//
this.nRPurchaseToolStripMenuItem.Name = "nRPurchaseToolStripMenuItem";
this.nRPurchaseToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
this.nRPurchaseToolStripMenuItem.Text = "NR Purchase";
this.nRPurchaseToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.nRPurchaseToolStripMenuItem.Text = "NR구매신청";
this.nRPurchaseToolStripMenuItem.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// infoToolStripMenuItem
//
this.infoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.staffToolStripMenuItem});
this.infoToolStripMenuItem.Name = "infoToolStripMenuItem";
this.infoToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
this.infoToolStripMenuItem.Text = "Info";
//
// staffToolStripMenuItem
//
this.staffToolStripMenuItem.Name = "staffToolStripMenuItem";
this.staffToolStripMenuItem.Size = new System.Drawing.Size(99, 22);
this.staffToolStripMenuItem.Text = "Staff";
//
// windowsMenu
//
this.windowsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -467,41 +467,41 @@
this.closeAllToolStripMenuItem,
this.arrangeIconsToolStripMenuItem});
this.windowsMenu.Name = "windowsMenu";
this.windowsMenu.Size = new System.Drawing.Size(82, 20);
this.windowsMenu.Text = "Window(&W)";
this.windowsMenu.Size = new System.Drawing.Size(84, 23);
this.windowsMenu.Text = "윈도우(&W)";
//
// cascadeToolStripMenuItem
//
this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem";
this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.cascadeToolStripMenuItem.Text = "계단식 배열(&C)";
this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.cascadeToolStripMenuItem_Click);
//
// tileVerticalToolStripMenuItem
//
this.tileVerticalToolStripMenuItem.Name = "tileVerticalToolStripMenuItem";
this.tileVerticalToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.tileVerticalToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.tileVerticalToolStripMenuItem.Text = "세로 바둑판식 배열(&V)";
this.tileVerticalToolStripMenuItem.Click += new System.EventHandler(this.tileVerticalToolStripMenuItem_Click);
//
// tileHorizontalToolStripMenuItem
//
this.tileHorizontalToolStripMenuItem.Name = "tileHorizontalToolStripMenuItem";
this.tileHorizontalToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.tileHorizontalToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.tileHorizontalToolStripMenuItem.Text = "가로 바둑판식 배열(&H)";
this.tileHorizontalToolStripMenuItem.Click += new System.EventHandler(this.tileHorizontalToolStripMenuItem_Click);
//
// closeAllToolStripMenuItem
//
this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.closeAllToolStripMenuItem.Text = "모두 닫기(&L)";
this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click);
//
// arrangeIconsToolStripMenuItem
//
this.arrangeIconsToolStripMenuItem.Name = "arrangeIconsToolStripMenuItem";
this.arrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.arrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.arrangeIconsToolStripMenuItem.Text = "아이콘 정렬(&A)";
this.arrangeIconsToolStripMenuItem.Click += new System.EventHandler(this.arrangeIconsToolStripMenuItem_Click);
//
@@ -509,37 +509,46 @@
//
this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.purchaseImportToolStripMenuItem,
this.purchaseDataConvertToolStripMenuItem});
this.purchaseDataConvertToolStripMenuItem,
this.customerImportToolStripMenuItem});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(73, 20);
this.btDev.Text = "Developer";
this.btDev.Size = new System.Drawing.Size(91, 23);
this.btDev.Text = "개발자메뉴";
this.btDev.Visible = false;
//
// purchaseImportToolStripMenuItem
//
this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem";
this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.purchaseImportToolStripMenuItem.Text = "Purchase Import";
this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click);
//
// purchaseDataConvertToolStripMenuItem
//
this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem";
this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert";
this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click);
//
// customerImportToolStripMenuItem
//
this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem";
this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.customerImportToolStripMenuItem.Text = "Customer Import";
this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click);
//
// toolStrip
//
this.toolStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1,
this.toolStripButton2,
this.toolStripButton3,
this.toolStripButton4});
this.toolStrip.Location = new System.Drawing.Point(1, 25);
this.toolStrip.Location = new System.Drawing.Point(1, 28);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(1035, 25);
this.toolStrip.Size = new System.Drawing.Size(1035, 27);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
//
@@ -549,7 +558,7 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
this.toolStripButton1.Size = new System.Drawing.Size(24, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@@ -559,7 +568,7 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(23, 22);
this.toolStripButton2.Size = new System.Drawing.Size(24, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
@@ -570,7 +579,7 @@
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
this.toolStripButton3.Size = new System.Drawing.Size(24, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
@@ -580,7 +589,7 @@
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 22);
this.toolStripButton4.Size = new System.Drawing.Size(24, 24);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -645,8 +654,6 @@
private System.Windows.Forms.ToolStripMenuItem managementToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem equipmentToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem lineCodeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem staffToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem staffGridToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataFOLToolStripMenuItem;
@@ -677,6 +684,8 @@
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripMenuItem workReportToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
}
}

55
Project/fMain.cs
View File

@@ -96,10 +96,11 @@ namespace Project
FCOMMON.info.Login.tel);
Pub.log.Add("Program Start");
bw.RunWorkerAsync(); //background worker
if(Pub.setting.startForm == eFormList.NR구매관리)
{
menu_nrpurchase();
}
}
@@ -337,7 +338,7 @@ namespace Project
private void codesToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.fCode();
f.MdiParent = this;
//f.MdiParent = this;
f.Show();
}
@@ -367,11 +368,34 @@ namespace Project
f.Show();
}
FEQ0000.fPurchase fpurchase = null;
void menu_nrpurchase()
{
if(Pub.setting.DupWindow)
{
var f = new FEQ0000.fPurchase();
f.MdiParent = this;
f.Show();
}
else
{
if(fpurchase == null || fpurchase.IsDisposed)
{
fpurchase = new FEQ0000.fPurchase();
fpurchase.MdiParent = this;
fpurchase.Show();
}
else
{
if (fpurchase.WindowState == FormWindowState.Minimized) fpurchase.WindowState = FormWindowState.Normal;
fpurchase.Show();
fpurchase.Activate();
}
}
}
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FEQ0000.fPurchase();
f.MdiParent = this;
f.Show();
menu_nrpurchase();
}
private void purchaseImportToolStripMenuItem_Click(object sender, EventArgs e)
@@ -441,5 +465,22 @@ namespace Project
f.MdiParent = this;
f.Show();
}
private void customerImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.Customer_Import();
f.MdiParent = this;
f.Show();
}
private void staffToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void 업체담당자ToolStripMenuItem_Click(object sender, EventArgs e)
{
}
}
}

20
Project/fMain.resx
View File

@@ -153,16 +153,16 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIcSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f5204TgX9PL3d9PrnRz
nV7n9GrnhJg/cxpcHs8pteKFakcFqdWtf1JmFL0p6c3+M3Nlyf9du+v/r1qQ96+n3u/f2VWF/76ea/2/
f3bqz9m1HkdXhYYyQ7UhQHxj1+eWtbP+zzq59H/f/ln/m7dO+F++pvV/+sLK//Fzyv/nLa7+37Cq9n/t
3IJfRRNTjsXNLo+BaoWAtJbOK7Xzp//f9WAvBt5+d/f/VVc2/p97etn/CQfn/i/Z2PM3Zl7FW6hWCEhq
bl6c1tv/G6apZ99MrDQIzzm17H/ygqoLUK0QkNTamppe3/IHpihuThlWGoRBroifV74aqhUCUjo6ZNKq
+v5vv7eboAH12yf/iJtT2gLVigCxxb1/Fx5fB1aEzwvFa9o/xs4pS4VqQ4DE+u53XevmwxViw5tubf8f
Pa/yR8LMClOoNgRIau44FdXV8jdpWsF3GI6eX/Ejen4lHCdOy/+ZvKCmH6oFFaRV9GWkVvZthXJJB6ll
vbpp5e3vU6r6DaBCpIOM2omHM6o7/mXWTPqfVtmPgjNqJv6PL5r4O6duCnYvgEB8VcePOesO/U8v6v8O
FYIDfHJwkAk0Pb5wwu/s2sk9UCE4QJVjYAAANRyjD7U4Ir0AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U4//r+nl7u8nV7q5
Tq9zerWzJ+bPnAaXx3NKrXih2lFBanXjn5QZRW9KOrP/zFxZ8n/X7vr/y+bk/euo9/t3clnhv6/nWv/v
n576c3atx9FVoaHMUG0IEN/Y9bll7az/s04u/d+3f9b/5q0T/pevaf2fvrDyf/yc8v95i6v/N6yq/V87
t+BX0cSUY3Gzy2OgWiEgraXzSu386f93PdiLgbff3f1/1ZWN/+eeXvZ/wsG5/ws29vyNmVfxFqoVApKa
mxcn9fb/hmnq2TcTKw3Cc04t+5+8oOoCVCsEJLW2pqbXN/yBKYqbU4aVBmGQK+Lnla+GaoWAlI4OmbSq
vv/b7+0maED99sk/4uaUtkC1IkBkfu/fhcfXgRXh80LxmvaPsXPKUqHaECCxvvtd17r5cIXY8KZb2/9H
z6v8kTCzwhSqDQGSmjtOhXW1/E2alP8dhqPnV/yInl8Jx4lTsn8mL6jph2pBBWkVfRmplX1boVzSQWpZ
r25aefv7lKp+A6gQ6SCjduLhjOqWf5k1k/6nVfaj4Iyaif/j8yb+zqmbgt0LIBBd1fJjzrpD/9Pz+79D
heAAnxwcZAJNj8+d8Du7dnIPVAgOUOUYGAA7lKKQuxE4AgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

16
Project/fSetting.cs
View File

@@ -53,14 +53,14 @@ namespace Project
this.bsModel.EndEdit();
this.Invalidate();
var f = new Dialog.fPassword();
if (f.ShowDialog() != DialogResult.OK) return;
var pass = f.tbInput.Text;
if (pass != Pub.setting.Password_Setup)
{
Util.MsgE("Password incorrect");
return;
}
//var f = new Dialog.fPassword();
//if (f.ShowDialog() != DialogResult.OK) return;
//var pass = f.tbInput.Text;
//if (pass != Pub.setting.Password_Setup)
//{
// Util.MsgE("Password incorrect");
// return;
//}
if(this.dataSet1.HasChanges())
{