diff --git a/Handler/.gitignore b/Handler/.gitignore index 5bad711..f7f2c57 100644 --- a/Handler/.gitignore +++ b/Handler/.gitignore @@ -6,5 +6,4 @@ obj desktop.ini .vs packages -/*.sln -/Sub/Sub.zip +*.zip diff --git a/Handler/DLL/arCommUtil.dll b/Handler/DLL/arCommUtil.dll index 5ba1274..6209728 100644 Binary files a/Handler/DLL/arCommUtil.dll and b/Handler/DLL/arCommUtil.dll differ diff --git a/Handler/Project/Button/RESET.cs b/Handler/Project/Button/RESET.cs index f5b6496..476a139 100644 --- a/Handler/Project/Button/RESET.cs +++ b/Handler/Project/Button/RESET.cs @@ -12,7 +12,7 @@ namespace Project void _BUTTON_RESET() { - //RESET 버튼 눌렸을때 공통 처리 사항 + //Common processing when RESET button is pressed DIO.SetBuzzer(false); //buzzer off if (PUB.popup.Visible) @@ -25,11 +25,11 @@ namespace Project PUB.flag.set(eVarBool.FG_KEYENCE_OFFF, false, "USER"); PUB.flag.set(eVarBool.FG_KEYENCE_OFFR, false, "USER"); - //팝업메세지가 제거가능한 메세지라면 없앤다. + //Remove popup message if it's a removable message. if (hmi1.HasPopupMenu && hmi1.PopupMenuRequireInput == false) hmi1.DelMenu(); - //알람클리어작업(모션에 오류가 있는 경우에만) + //Alarm clear work (only when motion has error) if (PUB.mot.IsInit && PUB.mot.HasServoAlarm) { PUB.mot.SetAlarmClearOn(); @@ -37,48 +37,48 @@ namespace Project PUB.mot.SetAlarmClearOff(); } - //자재가 없고, 센서도 반응안하는데. 진공이 되어잇으면 off한다 + //If there's no material and sensor doesn't respond but vacuum is on, turn it off if (DIO.isVacOKL() == 0 && PUB.flag.get(eVarBool.FG_PK_ITEMON) == false && DIO.GetIOOutput(eDOName.PICK_VAC1) == false) DIO.SetPickerVac(false, true); - //중단, 오류 모드일때에는 이 리셋이 의미가 있다. + //This reset is meaningful in stop and error mode. if (PUB.sm.Step == eSMStep.RUN) { - PUB.log.Add("동작중에는 [RESET] 버튼이 동작하지 않습니다"); + PUB.log.Add("[RESET] button does not work during operation"); } else if (PUB.sm.Step == eSMStep.PAUSE) { - //시작대기상태로 전환(대기상태일때 시작키를 누르면 실행 됨) + //Switch to start waiting state (execution starts when start key is pressed in waiting state) PUB.sm.SetNewStep(eSMStep.WAITSTART); PUB.log.AddAT("Reset Clear System Resume & Pause ON"); } else if (PUB.sm.Step == eSMStep.EMERGENCY) { PUB.popup.setMessage("EMERGENCY RESET\n" + - "[비상정지] 상태에는 [시스템초기화] 를 실행 해야 합니다\n" + - "상단메뉴 [초기화] 를 실행하세요"); + "[Emergency Stop] state requires [System Initialization]\n" + + "Execute [Initialize] from the top menu"); - PUB.log.Add("RESET버튼으로 인해 EMG 상황에서 IDLE전환"); + PUB.log.Add("RESET button caused transition from EMG situation to IDLE"); PUB.sm.SetNewStep(eSMStep.IDLE); } else if (PUB.sm.Step == eSMStep.ERROR) { - PUB.log.Add("RESET버튼으로 인해 ERR 상황에서 IDLE전환"); + PUB.log.Add("RESET button caused transition from ERR situation to IDLE"); PUB.sm.SetNewStep(eSMStep.IDLE); } else if (PUB.sm.Step == eSMStep.WAITSTART) { - //시작대기중일때에도 아무 처리안함 - //Pub.log.Add("시작버튼대기중에는 [RESET] 버튼이 동작하지 않습니다"); + //No processing even when waiting for start + //Pub.log.Add("[RESET] button does not work while waiting for start button"); } else if (PUB.sm.Step == eSMStep.IDLE) { - //Pub.log.Add("대기중에는 [RESET] 버튼이 동작하지 않습니다"); + //Pub.log.Add("[RESET] button does not work during standby"); } else { - //Pub.log.AddE("정의되지 않은 상태에서의 REST 키 버튼 입력 - 대기상태로 전환합니다"); + //Pub.log.AddE("REST key button input from undefined state - switching to standby state"); PUB.sm.SetNewStep(eSMStep.IDLE); } } diff --git a/Handler/Project/Class/EnumData.cs b/Handler/Project/Class/EnumData.cs index a5129d4..467658a 100644 --- a/Handler/Project/Class/EnumData.cs +++ b/Handler/Project/Class/EnumData.cs @@ -445,7 +445,8 @@ namespace Project CAM_LEFT, CAM_RIGHT, INCOMPLETE_LOADERDATA, - NOPUTPOSITION, + INCOMPLETE_INFOSELECT, + NOPUTPOSITION, NOREELSIZE, PRINTER, QRDATAMISSMATCHL, diff --git a/Handler/Project/Class/Reel.cs b/Handler/Project/Class/Reel.cs index fe2eb2f..dc85b67 100644 --- a/Handler/Project/Class/Reel.cs +++ b/Handler/Project/Class/Reel.cs @@ -8,14 +8,14 @@ namespace Project.Class { public class Reel { - public string sid { get; set; } - public string lot { get; set; } + public string SID { get; set; } + public string venderLot { get; set; } public string mfg { get; set; } public int qty { get; set; } public string id { get; set; } //public string date { get; set; } - public string partnum { get; set; } - public string manu { get; set; } + public string PartNo { get; set; } + public string venderName { get; set; } public Reel() { @@ -23,30 +23,30 @@ namespace Project.Class } public void Clear() { - sid = string.Empty; - lot = string.Empty; + SID = string.Empty; + venderLot = string.Empty; mfg = string.Empty; - lot = string.Empty; + venderLot = string.Empty; id = string.Empty; //date = string.Empty; - partnum = string.Empty; - manu = string.Empty; + PartNo = string.Empty; + venderName = string.Empty; qty = 0; } public Reel(string _sid, string _lot, string _manu, int _qty, string _id, string _mfgdate, string _partnum) { int sidNum = 0; if (int.TryParse(_sid, out sidNum) && sidNum.ToString().Length == 9) - sid = sidNum.ToString(); + SID = sidNum.ToString(); else throw new Exception("SID가 숫자가 아니거나 9자리 숫자가 아닙니다."); - lot = _lot; + venderLot = _lot; mfg = _mfgdate; qty = _qty; id = _id; - partnum = _partnum; - manu = _manu; + PartNo = _partnum; + venderName = _manu; } public Reel(string qrbarcodestr) { @@ -54,9 +54,9 @@ namespace Project.Class if (spData.Length < 6) throw new Exception("Barcode Length가 적습니다."); - sid = spData[0]; - lot = spData[1]; - manu = spData[2]; + SID = spData[0]; + venderLot = spData[1]; + venderName = spData[2]; int _qty = 0; @@ -67,8 +67,8 @@ namespace Project.Class id = spData[4]; mfg = spData[5]; - if (spData.Length > 6) partnum = spData[6]; - else partnum = string.Empty; + if (spData.Length > 6) PartNo = spData[6]; + else PartNo = string.Empty; } } } diff --git a/Handler/Project/Class/VisionData.cs b/Handler/Project/Class/VisionData.cs index 4077839..26048ff 100644 --- a/Handler/Project/Class/VisionData.cs +++ b/Handler/Project/Class/VisionData.cs @@ -573,6 +573,7 @@ namespace Project.Class public string LastQueryStringSID = string.Empty; public string LastQueryStringWMS = string.Empty; public string LastQueryStringCNV = string.Empty; + public string LastQueryStringJOB = string.Empty; public VisionData(string reason) { @@ -586,7 +587,8 @@ namespace Project.Class { LastQueryStringSID = string.Empty; LastQueryStringWMS = string.Empty; - LastQueryStringCNV = string.Empty; + LastQueryStringCNV = string.Empty; + LastQueryStringJOB = string.Empty; RetryLoader = 0; ApplyOffset = false; var baktime = new DateTime(1982, 11, 23); diff --git a/Handler/Project/Controller/ModelController.cs b/Handler/Project/Controller/ModelController.cs index 5a1f0a2..0b5ee39 100644 --- a/Handler/Project/Controller/ModelController.cs +++ b/Handler/Project/Controller/ModelController.cs @@ -10,9 +10,9 @@ namespace Project.Controller public class ModelController : ApiController { //private static List _values = new List { - // new Item { Id = 1, Name = "USB2.0 연장선" }, - // new Item { Id = 2, Name = "USB3.0 연장선" }, - // new Item { Id =3, Name = "USB3.1 연장선" } + // new Item { Id = 1, Name = "USB2.0 Extension Cable" }, + // new Item { Id = 2, Name = "USB3.0 Extension Cable" }, + // new Item { Id =3, Name = "USB3.1 Extension Cable" } //}; // GET api/values @@ -41,7 +41,7 @@ namespace Project.Controller [HttpGet] public IHttpActionResult Set(string id) { - //지정된 모델로 변경한다. + //Change to specified model. var msg = ""; if (id.isEmpty()) msg = "NO MODELNAME"; diff --git a/Handler/Project/Controller/StateController.cs b/Handler/Project/Controller/StateController.cs index ee7ccd5..2f3b6e5 100644 --- a/Handler/Project/Controller/StateController.cs +++ b/Handler/Project/Controller/StateController.cs @@ -18,9 +18,9 @@ namespace Project.Controller public class StateController : ApiController { //private static List _values = new List { - // new Item { Id = 1, Name = "USB2.0 연장선" }, - // new Item { Id = 2, Name = "USB3.0 연장선" }, - // new Item { Id =3, Name = "USB3.1 연장선" } + // new Item { Id = 1, Name = "USB2.0 Extension Cable" }, + // new Item { Id = 2, Name = "USB3.0 Extension Cable" }, + // new Item { Id =3, Name = "USB3.1 Extension Cable" } //}; // GET api/values diff --git a/Handler/Project/DSList.Designer.cs b/Handler/Project/DSList.Designer.cs index 5a7bf57..57dbf47 100644 --- a/Handler/Project/DSList.Designer.cs +++ b/Handler/Project/DSList.Designer.cs @@ -1793,7 +1793,7 @@ namespace Project.DSListTableAdapters { this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Component_Reel_CustRule] WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [K4EE_Component_Reel_CustRule] WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pre", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -1819,8 +1819,8 @@ SELECT idx, code, MatchEx, MatchIndex, GroupIndex, ReplaceEx, ReplaceStr, varNam this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", 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 [Component_Reel_CustRule] SET [code] = @code, [pre] = @pre, [pos] = @pos, [len] = @len, [exp] = @exp WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp))); -SELECT code, pre, pos, len, exp FROM Component_Reel_CustRule WHERE (code = @code)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [K4EE_Component_Reel_CustRule] SET [code] = @code, [pre] = @pre, [pos] = @pos, [len] = @len, [exp] = @exp WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp))); +SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code = @code)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pre", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/Handler/Project/DataSet1.cs b/Handler/Project/DataSet1.cs index 648e496..c8f4526 100644 --- a/Handler/Project/DataSet1.cs +++ b/Handler/Project/DataSet1.cs @@ -14,3 +14,10 @@ } } } + +namespace Project.DataSet1TableAdapters { + + + public partial class K4EE_Component_Reel_RegExRuleTableAdapter { + } +} diff --git a/Handler/Project/DataSet1.xsd b/Handler/Project/DataSet1.xsd index 3b5edd9..83db287 100644 --- a/Handler/Project/DataSet1.xsd +++ b/Handler/Project/DataSet1.xsd @@ -494,6 +494,17 @@ SELECT Id, Seq, CustCode, Description, Symbol, Pattern, Groups, IsEnable, IsTrus + + + + SELECT COUNT(*) FROM K4EE_Component_Reel_RegExRule where custcode = @custcode and description=@desc + + + + + + + diff --git a/Handler/Project/DataSet1.xss b/Handler/Project/DataSet1.xss index 6718180..fd595a7 100644 --- a/Handler/Project/DataSet1.xss +++ b/Handler/Project/DataSet1.xss @@ -4,34 +4,34 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - - + + - + - + - - + + - - + + - + - + \ No newline at end of file diff --git a/Handler/Project/DataSet11.Designer.cs b/Handler/Project/DataSet11.Designer.cs index 243a536..d5e1377 100644 --- a/Handler/Project/DataSet11.Designer.cs +++ b/Handler/Project/DataSet11.Designer.cs @@ -18005,7 +18005,7 @@ SELECT Id, Seq, CustCode, Description, Symbol, Pattern, Groups, IsEnable, IsTrus [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT Id, Seq, CustCode, Description, Symbol, Pattern, Groups, IsEnable, IsTrus" + @@ -18015,27 +18015,34 @@ SELECT Id, Seq, CustCode, Description, Symbol, Pattern, Groups, IsEnable, IsTrus this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust," + - " Pattern, Seq, Symbol\r\nFROM K4EE_Component_Reel_RegExRule\r\nORDER BY CustCode" + - ", Seq, Description"; + this._commandCollection[1].CommandText = "SELECT COUNT(*) FROM K4EE_Component_Reel_RegExRule where custcode = @custcode and" + + " description=@desc"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "CustCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@desc", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust, Pattern, Seq, Symbol + this._commandCollection[2].CommandText = "SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust," + + " Pattern, Seq, Symbol\r\nFROM K4EE_Component_Reel_RegExRule\r\nORDER BY CustCode" + + ", Seq, Description"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = @"SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust, Pattern, Seq, Symbol FROM K4EE_Component_Reel_RegExRule WHERE (ISNULL(CustCode, '') = '') OR (ISNULL(CustCode, '') LIKE @custcode) ORDER BY CustCode, Seq, Description"; - this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust," + + this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "SELECT CustCode, Description, Groups, Id, IsAmkStd, IsEnable, IsIgnore, IsTrust," + " Pattern, Seq, Symbol\r\nFROM K4EE_Component_Reel_RegExRule\r\nWHERE (ISNULL(Cu" + "stCode, \'\') LIKE @custcode) AND (ISNULL(IsIgnore, 0) = 1)\r\nORDER BY CustCode, Se" + "q, Description"; - this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@custcode", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18079,7 +18086,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillAll(DataSet1.K4EE_Component_Reel_RegExRuleDataTable dataTable) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -18092,7 +18099,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DataSet1.K4EE_Component_Reel_RegExRuleDataTable GetAll() { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; DataSet1.K4EE_Component_Reel_RegExRuleDataTable dataTable = new DataSet1.K4EE_Component_Reel_RegExRuleDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18103,7 +18110,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillByWithSample(DataSet1.K4EE_Component_Reel_RegExRuleDataTable dataTable, string custcode) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((custcode == null)) { throw new global::System.ArgumentNullException("custcode"); } @@ -18122,7 +18129,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DataSet1.K4EE_Component_Reel_RegExRuleDataTable GetByWithSample(string custcode) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((custcode == null)) { throw new global::System.ArgumentNullException("custcode"); } @@ -18139,7 +18146,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillIgnore(DataSet1.K4EE_Component_Reel_RegExRuleDataTable dataTable, string custcode) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((custcode == null)) { throw new global::System.ArgumentNullException("custcode"); } @@ -18158,7 +18165,7 @@ ORDER BY CustCode, Seq, Description"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DataSet1.K4EE_Component_Reel_RegExRuleDataTable GetIgnore(string custcode) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((custcode == null)) { throw new global::System.ArgumentNullException("custcode"); } @@ -18577,6 +18584,46 @@ ORDER BY CustCode, Seq, Description"; global::System.Nullable Original_IsIgnore) { return this.Update(Seq, CustCode, Description, Symbol, Pattern, Groups, IsEnable, IsTrust, IsAmkStd, IsIgnore, Original_Id, Original_Seq, Original_CustCode, Original_Description, Original_Symbol, Original_Groups, Original_IsEnable, Original_IsTrust, Original_IsAmkStd, Original_IsIgnore, Original_Id); } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual global::System.Nullable CheckExsist(string custcode, string desc) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((custcode == null)) { + command.Parameters[0].Value = global::System.DBNull.Value; + } + else { + command.Parameters[0].Value = ((string)(custcode)); + } + if ((desc == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(desc)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return new global::System.Nullable(); + } + else { + return new global::System.Nullable(((int)(returnValue))); + } + } } /// diff --git a/Handler/Project/Device/SATOPrinter.cs b/Handler/Project/Device/SATOPrinter.cs index f22bbd7..eeec0f8 100644 --- a/Handler/Project/Device/SATOPrinter.cs +++ b/Handler/Project/Device/SATOPrinter.cs @@ -57,15 +57,15 @@ namespace Project.Device var printcode = "103077807;Z577603504;105-35282-1105;15000;RC00004A219001W;20210612"; var reel = new Class.Reel(printcode); //reel.id = "RLID" + DateTime.Now.ToString("MMHHmmssfff"); - reel.sid = "103000000"; - reel.partnum = "PARTNO".PadRight(20, '0'); //20자리 + reel.SID = "103000000"; + reel.PartNo = "PARTNO".PadRight(20, '0'); //20자리 if (mfgdate == "") reel.mfg = dtstr; else reel.mfg = mfgdate; - reel.lot = "LOT000000000"; - if (manu == "") reel.manu = "ATK4EET1"; - else reel.manu = manu; + reel.venderLot = "LOT000000000"; + if (manu == "") reel.venderName = "ATK4EET1"; + else reel.venderName = manu; reel.qty = 15000; var rlt = Print(reel, true, drawbox); @@ -102,7 +102,7 @@ namespace Project.Device public string makeZPL_210908(Class.Reel reel, Boolean drawbox, out string qrData) { string m_strSend = string.Empty; - qrData = string.Format("{0};{1};{2};{3};{4};{5};{6}", reel.sid, reel.lot, reel.manu, reel.qty, reel.id, reel.mfg, reel.partnum); + qrData = string.Format("{0};{1};{2};{3};{4};{5};{6}", reel.SID, reel.venderLot, reel.venderName, reel.qty, reel.id, reel.mfg, reel.PartNo); var reeid = reel.id; if (reeid.Length > 20) @@ -110,13 +110,13 @@ namespace Project.Device m_strSend = this.baseZPL; m_strSend = m_strSend.Replace("{qrData}", qrData); - m_strSend = m_strSend.Replace("{sid}", reel.sid); - m_strSend = m_strSend.Replace("{lot}", reel.lot); - m_strSend = m_strSend.Replace("{partnum}", reel.partnum); + m_strSend = m_strSend.Replace("{sid}", reel.SID); + m_strSend = m_strSend.Replace("{lot}", reel.venderLot); + m_strSend = m_strSend.Replace("{partnum}", reel.PartNo); m_strSend = m_strSend.Replace("{rid}", reeid); m_strSend = m_strSend.Replace("{qty}", reel.qty.ToString()); m_strSend = m_strSend.Replace("{mfg}", reel.mfg); - m_strSend = m_strSend.Replace("{supply}", reel.manu); + m_strSend = m_strSend.Replace("{supply}", reel.venderName); //줄바꿈제거 m_strSend = m_strSend.Replace("\r", "").Replace("\n", ""); diff --git a/Handler/Project/Device/SATOPrinterAPI.cs b/Handler/Project/Device/SATOPrinterAPI.cs index 90a4610..7575599 100644 --- a/Handler/Project/Device/SATOPrinterAPI.cs +++ b/Handler/Project/Device/SATOPrinterAPI.cs @@ -225,15 +225,15 @@ namespace Project.Device var printcode = "103077807;Z577603504;105-35282-1105;15000;RC00004A219001W;20210612"; var reel = new Class.Reel(printcode); //reel.id = "RLID" + DateTime.Now.ToString("MMHHmmssfff"); - reel.sid = "103000000"; - reel.partnum = "PARTNO".PadRight(20, '0'); //20자리 + reel.SID = "103000000"; + reel.PartNo = "PARTNO".PadRight(20, '0'); //20자리 if (mfgdate == "") reel.mfg = dtstr; else reel.mfg = mfgdate; - reel.lot = "LOT000000000"; - if (manu == "") reel.manu = "ATK4EET1"; - else reel.manu = manu; + reel.venderLot = "LOT000000000"; + if (manu == "") reel.venderName = "ATK4EET1"; + else reel.venderName = manu; reel.qty = 15000; var rlt = Print(reel, true, drawbox); @@ -270,7 +270,7 @@ namespace Project.Device public string makeZPL_210908(Class.Reel reel, Boolean drawbox, out string qrData) { string m_strSend = string.Empty; - qrData = string.Format("{0};{1};{2};{3};{4};{5};{6}", reel.sid, reel.lot, reel.manu, reel.qty, reel.id, reel.mfg, reel.partnum); + qrData = string.Format("{0};{1};{2};{3};{4};{5};{6}", reel.SID, reel.venderLot, reel.venderName, reel.qty, reel.id, reel.mfg, reel.PartNo); var reeid = reel.id; if (reeid.Length > 20) @@ -278,13 +278,13 @@ namespace Project.Device m_strSend = this.baseZPL; m_strSend = m_strSend.Replace("{qrData}", qrData); - m_strSend = m_strSend.Replace("{sid}", reel.sid); - m_strSend = m_strSend.Replace("{lot}", reel.lot); - m_strSend = m_strSend.Replace("{partnum}", reel.partnum); + m_strSend = m_strSend.Replace("{sid}", reel.SID); + m_strSend = m_strSend.Replace("{lot}", reel.venderLot); + m_strSend = m_strSend.Replace("{partnum}", reel.PartNo); m_strSend = m_strSend.Replace("{rid}", reeid); m_strSend = m_strSend.Replace("{qty}", reel.qty.ToString()); m_strSend = m_strSend.Replace("{mfg}", reel.mfg); - m_strSend = m_strSend.Replace("{supply}", reel.manu); + m_strSend = m_strSend.Replace("{supply}", reel.venderName); //줄바꿈제거 m_strSend = m_strSend.Replace("\r", "").Replace("\n", ""); diff --git a/Handler/Project/Dialog/DIOMonitor.cs b/Handler/Project/Dialog/DIOMonitor.cs index 14d129b..afaf411 100644 --- a/Handler/Project/Dialog/DIOMonitor.cs +++ b/Handler/Project/Dialog/DIOMonitor.cs @@ -399,7 +399,8 @@ namespace Project.Dialog foreach (var item in Enum.GetValues(typeof(eDOName))) { var em = (eDOName)item; - var dr = PUB.mdm.dataSet.InputDescription.Where(t => t.Idx == (int)item).FirstOrDefault(); + var itemidx = (int)em; + var dr = PUB.mdm.dataSet.OutputDescription.Where(t => t.Idx == itemidx).FirstOrDefault(); var pinNo = $"Y{(int)em:X2}"; var pinTitle = item.ToString(); var Desc = dr == null ? "" : dr.Description; diff --git a/Handler/Project/Dialog/Model_Motion.cs b/Handler/Project/Dialog/Model_Motion.cs index fcd0a6b..288031a 100644 --- a/Handler/Project/Dialog/Model_Motion.cs +++ b/Handler/Project/Dialog/Model_Motion.cs @@ -40,7 +40,7 @@ namespace Project //모터설정값을 보고 해당 모터의 목록을 표시한다. //사용하지 않는 축은 표시하지 않는다 - for (int i = 0; i < PUB.system.MotaxisCount; i++) + for (int i = 0; i < SETTING.System.MotaxisCount; i++) { var axis = (eAxis)i; var axisname = (eAxisName)i; diff --git a/Handler/Project/Dialog/Model_Motion_Desc.cs b/Handler/Project/Dialog/Model_Motion_Desc.cs index 417a892..729043c 100644 --- a/Handler/Project/Dialog/Model_Motion_Desc.cs +++ b/Handler/Project/Dialog/Model_Motion_Desc.cs @@ -54,7 +54,7 @@ namespace Project.Dialog //모터설정값을 보고 해당 모터의 목록을 표시한다. //사용하지 않는 축은 표시하지 않는다 - for (int i = 0; i < PUB.system.MotaxisCount; i++) + for (int i = 0; i < SETTING.System.MotaxisCount; i++) { var axis = (eAxis)i; var axisname = (eAxisName)i; diff --git a/Handler/Project/Dialog/Model_Operation.cs b/Handler/Project/Dialog/Model_Operation.cs index 776e33e..ad50be5 100644 --- a/Handler/Project/Dialog/Model_Operation.cs +++ b/Handler/Project/Dialog/Model_Operation.cs @@ -309,8 +309,8 @@ namespace Project var dr = drv.Row as DataSet1.OPModelRow; if (dr.Title == "") return; this.Value = dr.Title; - PUB.uSetting.useConv = VAR.BOOL[eVarBool.Use_Conveyor]; - PUB.uSetting.Save(); + SETTING.User.useConv = VAR.BOOL[eVarBool.Use_Conveyor]; + SETTING.User.Save(); DialogResult = System.Windows.Forms.DialogResult.OK; } diff --git a/Handler/Project/Dialog/RegExRule.Designer.cs b/Handler/Project/Dialog/RegExRule.Designer.cs index 30ba66f..e259c1b 100644 --- a/Handler/Project/Dialog/RegExRule.Designer.cs +++ b/Handler/Project/Dialog/RegExRule.Designer.cs @@ -50,30 +50,38 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.component_Reel_RegExRuleBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btCopy = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.dv1 = new System.Windows.Forms.DataGridView(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.tbPattern = new System.Windows.Forms.TextBox(); + this.tbGroups = new System.Windows.Forms.TextBox(); + this.cmbBCDTestBox = new System.Windows.Forms.ComboBox(); + this.btBcdTest = new System.Windows.Forms.Button(); + this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter(); + this.tam = new Project.DataSet1TableAdapters.TableAdapterManager(); + this.label3 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.cmbModelList = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.dvcModelName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.IsIgnore = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewCheckBoxColumn3 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter(); - this.tam = new Project.DataSet1TableAdapters.TableAdapterManager(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // bn @@ -97,8 +105,9 @@ this.bindingNavigatorDeleteItem, this.component_Reel_RegExRuleBindingNavigatorSaveItem, this.toolStripButton1, + this.btCopy, this.toolStripButton2}); - this.bn.Location = new System.Drawing.Point(0, 736); + this.bn.Location = new System.Drawing.Point(0, 609); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -114,8 +123,8 @@ this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(79, 22); - this.bindingNavigatorAddNewItem.Text = "새로 추가"; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(49, 22); + this.bindingNavigatorAddNewItem.Text = "Add"; // // bs // @@ -141,8 +150,8 @@ this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(51, 22); - this.bindingNavigatorDeleteItem.Text = "삭제"; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(61, 22); + this.bindingNavigatorDeleteItem.Text = "Delete"; // // bindingNavigatorMoveFirstItem // @@ -209,32 +218,51 @@ // this.component_Reel_RegExRuleBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("component_Reel_RegExRuleBindingNavigatorSaveItem.Image"))); this.component_Reel_RegExRuleBindingNavigatorSaveItem.Name = "component_Reel_RegExRuleBindingNavigatorSaveItem"; - this.component_Reel_RegExRuleBindingNavigatorSaveItem.Size = new System.Drawing.Size(91, 22); - this.component_Reel_RegExRuleBindingNavigatorSaveItem.Text = "데이터 저장"; + this.component_Reel_RegExRuleBindingNavigatorSaveItem.Size = new System.Drawing.Size(52, 22); + this.component_Reel_RegExRuleBindingNavigatorSaveItem.Text = "Save"; this.component_Reel_RegExRuleBindingNavigatorSaveItem.Click += new System.EventHandler(this.component_Reel_RegExRuleBindingNavigatorSaveItem_Click); // // toolStripButton1 // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.Image = global::Project.Properties.Resources.arrow_refresh_small; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(66, 22); this.toolStripButton1.Text = "Refresh"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // btCopy + // + this.btCopy.Image = global::Project.Properties.Resources.copy; + this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btCopy.Name = "btCopy"; + this.btCopy.Size = new System.Drawing.Size(55, 22); + this.btCopy.Text = "Copy"; + this.btCopy.Click += new System.EventHandler(this.btCopy_Click); + // + // toolStripButton2 + // + 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(83, 22); + this.toolStripButton2.Text = "Export List"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // dv1 // + this.dv1.AllowUserToAddRows = false; this.dv1.AutoGenerateColumns = false; this.dv1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dvcModelName, this.dataGridViewCheckBoxColumn1, this.IsIgnore, this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, this.dataGridViewCheckBoxColumn2, this.dataGridViewCheckBoxColumn3}); @@ -249,73 +277,12 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dv1.DefaultCellStyle = dataGridViewCellStyle4; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Location = new System.Drawing.Point(0, 27); this.dv1.Name = "dv1"; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(967, 557); + this.dv1.Size = new System.Drawing.Size(967, 380); this.dv1.TabIndex = 2; // - // dataGridViewCheckBoxColumn1 - // - this.dataGridViewCheckBoxColumn1.DataPropertyName = "IsEnable"; - this.dataGridViewCheckBoxColumn1.HeaderText = "사용"; - this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; - // - // IsIgnore - // - this.IsIgnore.DataPropertyName = "IsIgnore"; - this.IsIgnore.HeaderText = "제외"; - this.IsIgnore.Name = "IsIgnore"; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "Id"; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewTextBoxColumn1.HeaderText = "Id"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "Seq"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewTextBoxColumn2.HeaderText = "Seq"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "Symbol"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewTextBoxColumn5.HeaderText = "Symbol"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "CustCode"; - this.dataGridViewTextBoxColumn3.HeaderText = "CustCode"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "Description"; - this.dataGridViewTextBoxColumn4.HeaderText = "Description"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - // - // dataGridViewCheckBoxColumn2 - // - this.dataGridViewCheckBoxColumn2.DataPropertyName = "IsTrust"; - this.dataGridViewCheckBoxColumn2.HeaderText = "Trust"; - this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; - // - // dataGridViewCheckBoxColumn3 - // - this.dataGridViewCheckBoxColumn3.DataPropertyName = "IsAmkStd"; - this.dataGridViewCheckBoxColumn3.HeaderText = "AmkStd"; - this.dataGridViewCheckBoxColumn3.Name = "dataGridViewCheckBoxColumn3"; - // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 2; @@ -323,14 +290,17 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.textBox1, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.textBox2, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.tbPattern, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.tbGroups, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.cmbBCDTestBox, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.btBcdTest, 0, 2); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 557); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 430); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel1.Size = new System.Drawing.Size(967, 179); this.tableLayoutPanel1.TabIndex = 4; // @@ -339,7 +309,7 @@ this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Location = new System.Drawing.Point(3, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(116, 89); + this.label1.Size = new System.Drawing.Size(116, 76); this.label1.TabIndex = 0; this.label1.Text = "Pattern"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -347,36 +317,54 @@ // label2 // this.label2.Dock = System.Windows.Forms.DockStyle.Fill; - this.label2.Location = new System.Drawing.Point(3, 89); + this.label2.Location = new System.Drawing.Point(3, 76); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(116, 90); + this.label2.Size = new System.Drawing.Size(116, 76); this.label2.TabIndex = 0; this.label2.Text = "Groups"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // textBox1 + // tbPattern // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Pattern", true)); - this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox1.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.ForeColor = System.Drawing.Color.Black; - this.textBox1.Location = new System.Drawing.Point(125, 3); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(839, 83); - this.textBox1.TabIndex = 1; + this.tbPattern.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Pattern", true)); + this.tbPattern.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbPattern.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbPattern.ForeColor = System.Drawing.Color.Black; + this.tbPattern.Location = new System.Drawing.Point(125, 3); + this.tbPattern.Multiline = true; + this.tbPattern.Name = "tbPattern"; + this.tbPattern.Size = new System.Drawing.Size(839, 70); + this.tbPattern.TabIndex = 1; // - // textBox2 + // tbGroups // - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Groups", true)); - this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox2.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.ForeColor = System.Drawing.Color.Black; - this.textBox2.Location = new System.Drawing.Point(125, 92); - this.textBox2.Multiline = true; - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(839, 84); - this.textBox2.TabIndex = 1; + this.tbGroups.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Groups", true)); + this.tbGroups.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbGroups.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbGroups.ForeColor = System.Drawing.Color.Black; + this.tbGroups.Location = new System.Drawing.Point(125, 79); + this.tbGroups.Multiline = true; + this.tbGroups.Name = "tbGroups"; + this.tbGroups.Size = new System.Drawing.Size(839, 70); + this.tbGroups.TabIndex = 1; + // + // cmbBCDTestBox + // + this.cmbBCDTestBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbBCDTestBox.Location = new System.Drawing.Point(125, 155); + this.cmbBCDTestBox.Name = "cmbBCDTestBox"; + this.cmbBCDTestBox.Size = new System.Drawing.Size(839, 20); + this.cmbBCDTestBox.TabIndex = 2; + // + // btBcdTest + // + this.btBcdTest.Dock = System.Windows.Forms.DockStyle.Fill; + this.btBcdTest.Location = new System.Drawing.Point(3, 155); + this.btBcdTest.Name = "btBcdTest"; + this.btBcdTest.Size = new System.Drawing.Size(116, 21); + this.btBcdTest.TabIndex = 3; + this.btBcdTest.Text = "Test"; + this.btBcdTest.Click += new System.EventHandler(this.btBcdTest_Click); // // ta // @@ -395,21 +383,119 @@ this.tam.K4EE_Component_Reel_SID_InformationTableAdapter = null; this.tam.UpdateOrder = Project.DataSet1TableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // toolStripButton2 + // label3 // - 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(83, 22); - this.toolStripButton2.Text = "Export List"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + this.label3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label3.Location = new System.Drawing.Point(0, 407); + this.label3.Name = "label3"; + this.label3.Padding = new System.Windows.Forms.Padding(3, 3, 0, 0); + this.label3.Size = new System.Drawing.Size(967, 23); + this.label3.TabIndex = 5; + this.label3.Text = "Barcode Type 1: QR, 2:DataMatrix, 11: Code 39 || GROPS Item : SID,VLOT,VNAME,RID," + + "MFG,QTY"; + // + // panel1 + // + this.panel1.Controls.Add(this.cmbModelList); + this.panel1.Controls.Add(this.label4); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(967, 27); + this.panel1.TabIndex = 6; + // + // cmbModelList + // + this.cmbModelList.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbModelList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbModelList.Font = new System.Drawing.Font("굴림", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.cmbModelList.Location = new System.Drawing.Point(116, 0); + this.cmbModelList.Name = "cmbModelList"; + this.cmbModelList.Size = new System.Drawing.Size(851, 27); + this.cmbModelList.TabIndex = 3; + this.cmbModelList.SelectedIndexChanged += new System.EventHandler(this.cmbModelList_SelectedIndexChanged); + // + // label4 + // + this.label4.Dock = System.Windows.Forms.DockStyle.Left; + this.label4.Location = new System.Drawing.Point(0, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(116, 27); + this.label4.TabIndex = 1; + this.label4.Text = "Model"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // dvcModelName + // + this.dvcModelName.DataPropertyName = "CustCode"; + this.dvcModelName.HeaderText = "Model Name"; + this.dvcModelName.Name = "dvcModelName"; + this.dvcModelName.Visible = false; + // + // dataGridViewCheckBoxColumn1 + // + this.dataGridViewCheckBoxColumn1.DataPropertyName = "IsEnable"; + this.dataGridViewCheckBoxColumn1.HeaderText = "Enable"; + this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; + // + // IsIgnore + // + this.IsIgnore.DataPropertyName = "IsIgnore"; + this.IsIgnore.HeaderText = "Except"; + this.IsIgnore.Name = "IsIgnore"; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "Id"; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewTextBoxColumn1.HeaderText = "ID"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "Seq"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2; + this.dataGridViewTextBoxColumn2.HeaderText = "Order"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "Symbol"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewTextBoxColumn5.HeaderText = "Type"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn4.DataPropertyName = "Description"; + this.dataGridViewTextBoxColumn4.HeaderText = "Description"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + // + // dataGridViewCheckBoxColumn2 + // + this.dataGridViewCheckBoxColumn2.DataPropertyName = "IsTrust"; + this.dataGridViewCheckBoxColumn2.HeaderText = "Trust"; + this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; + // + // dataGridViewCheckBoxColumn3 + // + this.dataGridViewCheckBoxColumn3.DataPropertyName = "IsAmkStd"; + this.dataGridViewCheckBoxColumn3.HeaderText = "AmkStd"; + this.dataGridViewCheckBoxColumn3.Name = "dataGridViewCheckBoxColumn3"; // // RegExRule // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(967, 761); + this.ClientSize = new System.Drawing.Size(967, 634); this.Controls.Add(this.dv1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.label3); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.bn); this.Name = "RegExRule"; @@ -424,6 +510,7 @@ ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -453,17 +540,24 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox tbPattern; + private System.Windows.Forms.TextBox tbGroups; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox cmbBCDTestBox; + private System.Windows.Forms.Button btBcdTest; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox cmbModelList; + private System.Windows.Forms.ToolStripButton btCopy; + private System.Windows.Forms.DataGridViewTextBoxColumn dvcModelName; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; private System.Windows.Forms.DataGridViewCheckBoxColumn IsIgnore; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn3; - private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/Handler/Project/Dialog/RegExRule.cs b/Handler/Project/Dialog/RegExRule.cs index 1d35068..be683ea 100644 --- a/Handler/Project/Dialog/RegExRule.cs +++ b/Handler/Project/Dialog/RegExRule.cs @@ -1,12 +1,16 @@ using AR; +using Emgu.CV.Structure; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Data.Entity.Infrastructure.MappingViews; using System.Diagnostics; using System.Drawing; using System.Linq; +using System.ServiceModel; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; @@ -14,38 +18,102 @@ namespace Project.Dialog { public partial class RegExRule : Form { + string bcdteststring = ""; public RegExRule() { InitializeComponent(); - this.dataSet1.K4EE_Component_Reel_RegExRule.TableNewRow += (s1, e1) => { - if(PUB.Result.isSetvModel) + this.dv1.BorderStyle = BorderStyle.None; + this.dataSet1.K4EE_Component_Reel_RegExRule.TableNewRow += (s1, e1) => + { + if (PUB.Result.isSetvModel) e1.Row["CustCode"] = PUB.Result.vModel.Title; }; + + //모델목록을 업데이트한다. + cmbModelList.Items.Clear(); + foreach (var dr in PUB.mdm.dataSet.OPModel.OrderBy(t => t.Title)) + cmbModelList.Items.Add(dr.Title); + cmbModelList.Items.Add("ALL"); + + //현재 선택된 모델을 자동선택한다. + cmbModelList.Text = PUB.Result.vModel.Title; + + + + LoadSaveBCDtestData(); + } + + void LoadSaveBCDtestData(bool load = true) + { + var fn = "bcdtestlist.txt"; + if (load) + { + this.cmbBCDTestBox.Items.Clear(); + if (System.IO.File.Exists(fn)) + { + bcdteststring = System.IO.File.ReadAllText(fn, System.Text.Encoding.Default).Replace("\r", ""); + var lines = bcdteststring.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); + foreach (var lin in lines) + { + this.cmbBCDTestBox.Items.Add(lin); + } + } + else + { + this.cmbBCDTestBox.Items.Add($"101415540;LC15848629;TAIYOYUDEN;20000;RC18091A2526JMN;20250215"); + } + } + else + { + //save + var sb = new System.Text.StringBuilder(); + foreach (string item in this.cmbBCDTestBox.Items) + sb.AppendLine(item); + System.IO.File.WriteAllText(fn, sb.ToString(), System.Text.Encoding.Default); + } + } private void RegExRule_Load(object sender, EventArgs e) { - RefreshList(PUB.Result.vModel.Title); + if (cmbModelList.SelectedIndex == -1 && cmbModelList.Items.Count > 0) + cmbModelList.SelectedIndex = 0; } private void component_Reel_RegExRuleBindingNavigatorSaveItem_Click(object sender, EventArgs e) { this.Validate(); this.bs.EndEdit(); - this.tam.UpdateAll(this.dataSet1); + var cnt = this.tam.UpdateAll(this.dataSet1); + if (cnt == 0) + { + UTIL.MsgE("저장된 내용이 없습니다"); + } + else UTIL.MsgI($"{cnt}건의 자료가 저장 되었습니다"); var modelName = PUB.Result.vModel.Title; PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false); PUB.Result.BCDIgnorePattern = PUB.GetPatterns(modelName, true); PUB.log.Add($"모델패턴로딩:{PUB.Result.BCDPattern.Count}/{PUB.Result.BCDIgnorePattern.Count}"); + dv1.AutoResizeColumns(); } private void RefreshList(string cust) { try { - this.ta.FillByWithSample(this.dataSet1.K4EE_Component_Reel_RegExRule, cust); - foreach(DataGridViewRow drow in this.dv1.Rows) + if(cust == "ALL") + { + dvcModelName.Visible = true; + this.ta.FillAll(this.dataSet1.K4EE_Component_Reel_RegExRule); + } + else + { + dvcModelName.Visible = false; + this.ta.FillByWithSample(this.dataSet1.K4EE_Component_Reel_RegExRule, cust); + } + + foreach (DataGridViewRow drow in this.dv1.Rows) { var drv = drow.DataBoundItem as DataRowView; if (drv == null) continue; @@ -93,10 +161,131 @@ namespace Project.Dialog { System.Windows.Forms.MessageBox.Show(ex.Message); } + } + + private void btBcdTest_Click(object sender, EventArgs e) + { + + var bcd = cmbBCDTestBox.Text.Trim(); + //없는 문자라면 신규로 테스트한다. + if (cmbBCDTestBox.Items.Contains(bcd) == false) + cmbBCDTestBox.Items.Add(bcd); - + //test + LoadSaveBCDtestData(false); + + var sb = new System.Text.StringBuilder(); + var idx = 0; + foreach (DataSet1.K4EE_Component_Reel_RegExRuleRow dr in this.dataSet1.K4EE_Component_Reel_RegExRule) + { + var pattern = dr.Pattern;// tbPattern.Text.Trim(); + var grps = dr.Groups;// tbGroups.Text.Trim(); + + if (dr.IsEnable == false) + { + sb.AppendLine($"####{++idx} {dr.Description} - disble"); + continue; + } + + var regx = new Regex(pattern, RegexOptions.IgnoreCase, new TimeSpan(0, 0, 10)); + if (regx.IsMatch(bcd)) + { + sb.AppendLine($"####{++idx} {dr.Description}"); + var matchs = regx.Matches(bcd); + + foreach (System.Text.RegularExpressions.Match mat in matchs) + { + + var grpstr = this.tbGroups.Text.Trim().Split(','); + foreach (var matchdata in grpstr) + { + var grpname = matchdata.Split('=')[0]; + var grpno = matchdata.Split('=')[1].toInt(); + if (grpno <= mat.Groups.Count) + { + var data = mat.Groups[grpno]; + sb.AppendLine($"{grpname}={data.Value}"); + } + } + } + } + else + { + sb.AppendLine($"####{++idx} {dr.Description} - No Pattern\n{pattern}"); + } + } + + UTIL.MsgI(sb.ToString()); + + + } + + private void cmbModelList_SelectedIndexChanged(object sender, EventArgs e) + { + var title = cmbModelList.Text; + if (title.isEmpty()) title = PUB.Result.vModel.Title; + RefreshList(title); + } + + private void btCopy_Click(object sender, EventArgs e) + { + try + { + var drv = this.bs.Current as DataRowView; + if (drv == null) + { + UTIL.MsgE("Please select an item to copy."); + return; + } + + var sourceRow = drv.Row as DataSet1.K4EE_Component_Reel_RegExRuleRow; + if (sourceRow == null) return; + + var inputDialog = AR.UTIL.InputBox("Input ModelName", sourceRow.IsCustCodeNull() ? "" : sourceRow.CustCode); + if (inputDialog.Item1 == false) return; + var newModelName = inputDialog.Item2; + + var inputDialog2 = AR.UTIL.InputBox("Input Description", sourceRow.IsDescriptionNull() ? "" : sourceRow.Description); + if (inputDialog2.Item1 == false) return; + var newDescription = inputDialog2.Item2; + + var tacheck = new DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter(); + if (tacheck.CheckExsist(newModelName, newDescription) > 0) + { + UTIL.MsgE("이미 존재하는 이름입니다"); + return; + } + + if (this.dataSet1.K4EE_Component_Reel_RegExRule.Where(t => t.CustCode.Equals(newModelName) && t.Description.Equals(newDescription)).Count() > 0) + { + UTIL.MsgE("이미 존재하는 이름입니다"); + return; + } + + + var newRow = this.dataSet1.K4EE_Component_Reel_RegExRule.NewK4EE_Component_Reel_RegExRuleRow(); + + newRow.CustCode = newModelName; + newRow.Pattern = sourceRow.IsPatternNull() ? "" : sourceRow.Pattern; + newRow.Groups = sourceRow.IsGroupsNull() ? "" : sourceRow.Groups; + newRow.Description = newDescription; + newRow.IsEnable = sourceRow.IsEnable; + newRow.IsIgnore = sourceRow.IsIgnore; + newRow.Seq = sourceRow.Seq; + newRow.Symbol = sourceRow.Symbol; + newRow.IsTrust = sourceRow.IsTrust; + newRow.IsAmkStd = sourceRow.IsAmkStd; + this.dataSet1.K4EE_Component_Reel_RegExRule.AddK4EE_Component_Reel_RegExRuleRow(newRow); + + this.bs.MoveLast(); + UTIL.MsgI($"[{newModelName}-{newDescription}] Rule has been copied successfully."); + } + catch (System.Exception ex) + { + UTIL.MsgE($"Error occurred during copying: {ex.Message}"); + } } } } diff --git a/Handler/Project/Dialog/RegExRule.resx b/Handler/Project/Dialog/RegExRule.resx index c3b895c..c382833 100644 --- a/Handler/Project/Dialog/RegExRule.resx +++ b/Handler/Project/Dialog/RegExRule.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -142,7 +142,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -154,7 +154,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -174,7 +174,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -183,7 +183,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -194,38 +194,27 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + vAAADrwBlbxySQAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NxGMf3qv6EsF70MpBS0sjIF+XSmhnY + zVTMcjqnVGqWC4vMmEqmGZq4QYUoRS8qpIub1szc5nKjLTLN+/1Wrpa7H3fOmd9+52yogdADH54Xv9/z + 4Tzf8xNwFXdTm3Gs2qhJvGf8k1Bp9JJO8dRw3UQlVvdQR+8a+qNl+rrQpOeb+KH1FV/Rrbc6qd9Wu5u1 + uZdhc63x28lBYXDBiZI3MxDXDnlEeerNwdFAJVQarH+cXrZnioZpmoFphoFxioFh0gft6DLaB9xYZoDW + IS9KXk0j68Gg9x+JqELndXh8sMyy+DLLkM7gMy/xQTe2jPcDHiLww7LAwjRPo1w9A+H1zmf8cEpNzMSZ + yqQVqeIUshpOo+FdM8paaiAsDUMMQVS+H3HyvahtreVXcVEMFpc8iLuhY3hBcrXwZWefCqqRx2gwFvGS + 8/VHUfQ0HfnNqZAojyNTmYnW3kWo+l14+80BO8npsLyb4gWiOtHmxDsFrHG4C0/65KjS5vGSDEUCGT6B + 3Ic50I+5+VU+jHihITksuWkcLvsUEHAVX6mjChvFMI8ZoDRdw52Oq0ipOYSM+iSYpzwwk2C5gPXjgUxs + RBAnXyc4cKuUjirejvQ6ESzjPSjvugC5uhCp92PRrH2Nr3MMzCTYnkkanwhWJw3h7aAgQhYijZRtQ35T + Gs4q4pFWe4SXFKrTIWvJIV8SC+7cMsPiM/eLCU4SZHSxISCIlG2Zi5RtJZdCEFkUgpNVsbj4SAz9gAbl + mmJceCGGRJEMMxGYyNswEgFF+xF1Rbu2wsHibmrBTqF3juXRDc/jcmMussmgVJmKq02XVs84PD4WEQWa + NcG+Ii01a1sT/A83WSE8p22doPCjZ/SHY2Wjyxvhpnz+XRkqV3CcBJnbMbHg8DhHf7r8E7+8mLB6MRbk + l4vm4ZJ3USz3iPw+mrbvONf2PTguEOzJfXcxXNLesVuqsYVL1dQq2QHCslUBJCoqVNK2tDOz7UOYWJ0l + EAgEfwHCoaJtQ43MrwAAAABJRU5ErkJggg== diff --git a/Handler/Project/Dialog/fManualPrint.cs b/Handler/Project/Dialog/fManualPrint.cs index a739d03..ab11d98 100644 --- a/Handler/Project/Dialog/fManualPrint.cs +++ b/Handler/Project/Dialog/fManualPrint.cs @@ -88,13 +88,13 @@ namespace Project.Dialog zpl = Printer.makeZPL_210908(new Class.Reel { - sid = sid, - lot = lot, - manu = spy, + SID = sid, + venderLot = lot, + venderName = spy, qty = vqty, id = rid, mfg = mfg, - partnum = pan, + PartNo = pan, }, SETTING.Data.DrawOutbox, out qrdata); var cnt = (int)nudCnt.Value; diff --git a/Handler/Project/Dialog/fManualPrint0.Designer.cs b/Handler/Project/Dialog/fManualPrint0.Designer.cs index d3c1291..d6d8029 100644 --- a/Handler/Project/Dialog/fManualPrint0.Designer.cs +++ b/Handler/Project/Dialog/fManualPrint0.Designer.cs @@ -33,13 +33,13 @@ this.lbSID = new System.Windows.Forms.Label(); this.tbQty = new System.Windows.Forms.TextBox(); this.lbQty = new System.Windows.Forms.Label(); - this.tbPart = new System.Windows.Forms.TextBox(); + this.tbPartNo = new System.Windows.Forms.TextBox(); this.lbPart = new System.Windows.Forms.Label(); - this.tbMfg = new System.Windows.Forms.TextBox(); + this.tbMFGDate = new System.Windows.Forms.TextBox(); this.lbMFG = new System.Windows.Forms.Label(); - this.tbManu = new System.Windows.Forms.TextBox(); + this.tbVName = new System.Windows.Forms.TextBox(); this.lbManu = new System.Windows.Forms.Label(); - this.tbLot = new System.Windows.Forms.TextBox(); + this.tbVLot = new System.Windows.Forms.TextBox(); this.lbLot = new System.Windows.Forms.Label(); this.tbRid = new System.Windows.Forms.TextBox(); this.lbRID = new System.Windows.Forms.Label(); @@ -48,10 +48,10 @@ // btOK // this.btOK.Dock = System.Windows.Forms.DockStyle.Bottom; - this.btOK.Location = new System.Drawing.Point(0, 452); + this.btOK.Location = new System.Drawing.Point(0, 423); this.btOK.Margin = new System.Windows.Forms.Padding(8, 13, 8, 13); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(618, 50); + this.btOK.Size = new System.Drawing.Size(565, 50); this.btOK.TabIndex = 18; this.btOK.Text = "확인"; this.btOK.UseVisualStyleBackColor = true; @@ -59,164 +59,193 @@ // // tbSid // - this.tbSid.Location = new System.Drawing.Point(132, 380); + this.tbSid.BackColor = System.Drawing.Color.Gold; + this.tbSid.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSid.Location = new System.Drawing.Point(181, 371); this.tbSid.Margin = new System.Windows.Forms.Padding(7); this.tbSid.Name = "tbSid"; - this.tbSid.Size = new System.Drawing.Size(452, 39); + this.tbSid.Size = new System.Drawing.Size(376, 39); this.tbSid.TabIndex = 32; this.tbSid.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbSID // - this.lbSID.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbSID.Location = new System.Drawing.Point(17, 380); + this.lbSID.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbSID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbSID.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbSID.Location = new System.Drawing.Point(9, 371); this.lbSID.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbSID.Name = "lbSID"; - this.lbSID.Size = new System.Drawing.Size(101, 72); + this.lbSID.Size = new System.Drawing.Size(165, 39); this.lbSID.TabIndex = 31; - this.lbSID.Text = "sid"; - this.lbSID.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbSID.Text = "SID"; + this.lbSID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tbQty // - this.tbQty.Location = new System.Drawing.Point(132, 320); + this.tbQty.BackColor = System.Drawing.Color.Gold; + this.tbQty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbQty.Location = new System.Drawing.Point(181, 311); this.tbQty.Margin = new System.Windows.Forms.Padding(7); this.tbQty.Name = "tbQty"; - this.tbQty.Size = new System.Drawing.Size(452, 39); + this.tbQty.Size = new System.Drawing.Size(376, 39); this.tbQty.TabIndex = 30; this.tbQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbQty // - this.lbQty.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbQty.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbQty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbQty.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbQty.ForeColor = System.Drawing.Color.Blue; - this.lbQty.Location = new System.Drawing.Point(17, 320); + this.lbQty.Location = new System.Drawing.Point(9, 311); this.lbQty.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbQty.Name = "lbQty"; - this.lbQty.Size = new System.Drawing.Size(101, 72); + this.lbQty.Size = new System.Drawing.Size(165, 39); this.lbQty.TabIndex = 29; - this.lbQty.Text = "qty"; - this.lbQty.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbQty.Text = "QTY"; + this.lbQty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tbPart + // tbPartNo // - this.tbPart.Location = new System.Drawing.Point(132, 259); - this.tbPart.Margin = new System.Windows.Forms.Padding(7); - this.tbPart.Name = "tbPart"; - this.tbPart.Size = new System.Drawing.Size(452, 39); - this.tbPart.TabIndex = 28; - this.tbPart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbPartNo.BackColor = System.Drawing.Color.Gold; + this.tbPartNo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbPartNo.Location = new System.Drawing.Point(181, 250); + this.tbPartNo.Margin = new System.Windows.Forms.Padding(7); + this.tbPartNo.Name = "tbPartNo"; + this.tbPartNo.Size = new System.Drawing.Size(376, 39); + this.tbPartNo.TabIndex = 28; + this.tbPartNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbPart // - this.lbPart.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbPart.Location = new System.Drawing.Point(17, 259); + this.lbPart.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbPart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbPart.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbPart.Location = new System.Drawing.Point(9, 250); this.lbPart.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbPart.Name = "lbPart"; - this.lbPart.Size = new System.Drawing.Size(101, 72); + this.lbPart.Size = new System.Drawing.Size(165, 39); this.lbPart.TabIndex = 27; - this.lbPart.Text = "part"; - this.lbPart.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbPart.Text = "PART NO"; + this.lbPart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tbMfg + // tbMFGDate // - this.tbMfg.Location = new System.Drawing.Point(132, 198); - this.tbMfg.Margin = new System.Windows.Forms.Padding(7); - this.tbMfg.Name = "tbMfg"; - this.tbMfg.Size = new System.Drawing.Size(452, 39); - this.tbMfg.TabIndex = 26; - this.tbMfg.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbMFGDate.BackColor = System.Drawing.Color.Gold; + this.tbMFGDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbMFGDate.Location = new System.Drawing.Point(181, 189); + this.tbMFGDate.Margin = new System.Windows.Forms.Padding(7); + this.tbMFGDate.Name = "tbMFGDate"; + this.tbMFGDate.Size = new System.Drawing.Size(376, 39); + this.tbMFGDate.TabIndex = 26; + this.tbMFGDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbMFG // - this.lbMFG.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbMFG.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbMFG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbMFG.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbMFG.ForeColor = System.Drawing.Color.Blue; - this.lbMFG.Location = new System.Drawing.Point(17, 198); + this.lbMFG.Location = new System.Drawing.Point(9, 189); this.lbMFG.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbMFG.Name = "lbMFG"; - this.lbMFG.Size = new System.Drawing.Size(101, 72); + this.lbMFG.Size = new System.Drawing.Size(165, 39); this.lbMFG.TabIndex = 25; - this.lbMFG.Text = "mfg"; - this.lbMFG.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbMFG.Text = "MFG DATE"; + this.lbMFG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tbManu + // tbVName // - this.tbManu.Location = new System.Drawing.Point(132, 138); - this.tbManu.Margin = new System.Windows.Forms.Padding(7); - this.tbManu.Name = "tbManu"; - this.tbManu.Size = new System.Drawing.Size(452, 39); - this.tbManu.TabIndex = 24; - this.tbManu.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbVName.AcceptsReturn = true; + this.tbVName.BackColor = System.Drawing.Color.Gold; + this.tbVName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbVName.Location = new System.Drawing.Point(181, 129); + this.tbVName.Margin = new System.Windows.Forms.Padding(7); + this.tbVName.Name = "tbVName"; + this.tbVName.Size = new System.Drawing.Size(376, 39); + this.tbVName.TabIndex = 24; + this.tbVName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbManu // - this.lbManu.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbManu.Location = new System.Drawing.Point(17, 138); + this.lbManu.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbManu.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbManu.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbManu.Location = new System.Drawing.Point(9, 129); this.lbManu.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbManu.Name = "lbManu"; - this.lbManu.Size = new System.Drawing.Size(101, 72); + this.lbManu.Size = new System.Drawing.Size(165, 39); this.lbManu.TabIndex = 23; - this.lbManu.Text = "manu"; - this.lbManu.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbManu.Text = "VENDER NAME"; + this.lbManu.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tbLot + // tbVLot // - this.tbLot.Location = new System.Drawing.Point(132, 77); - this.tbLot.Margin = new System.Windows.Forms.Padding(7); - this.tbLot.Name = "tbLot"; - this.tbLot.Size = new System.Drawing.Size(452, 39); - this.tbLot.TabIndex = 22; - this.tbLot.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbVLot.BackColor = System.Drawing.Color.Gold; + this.tbVLot.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbVLot.Location = new System.Drawing.Point(181, 68); + this.tbVLot.Margin = new System.Windows.Forms.Padding(7); + this.tbVLot.Name = "tbVLot"; + this.tbVLot.Size = new System.Drawing.Size(376, 39); + this.tbVLot.TabIndex = 22; + this.tbVLot.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbLot // - this.lbLot.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbLot.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbLot.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbLot.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbLot.ForeColor = System.Drawing.Color.Blue; - this.lbLot.Location = new System.Drawing.Point(17, 77); + this.lbLot.Location = new System.Drawing.Point(9, 68); this.lbLot.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbLot.Name = "lbLot"; - this.lbLot.Size = new System.Drawing.Size(101, 72); + this.lbLot.Size = new System.Drawing.Size(165, 39); this.lbLot.TabIndex = 21; - this.lbLot.Text = "lot"; - this.lbLot.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbLot.Text = "VENDER LOT"; + this.lbLot.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tbRid // - this.tbRid.Location = new System.Drawing.Point(132, 16); + this.tbRid.BackColor = System.Drawing.Color.Gold; + this.tbRid.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRid.Location = new System.Drawing.Point(181, 11); this.tbRid.Margin = new System.Windows.Forms.Padding(7); this.tbRid.Name = "tbRid"; - this.tbRid.Size = new System.Drawing.Size(452, 39); + this.tbRid.Size = new System.Drawing.Size(376, 39); this.tbRid.TabIndex = 20; this.tbRid.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbRID // - this.lbRID.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbRID.BackColor = System.Drawing.Color.WhiteSmoke; + this.lbRID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbRID.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbRID.ForeColor = System.Drawing.Color.Blue; - this.lbRID.Location = new System.Drawing.Point(17, 20); + this.lbRID.Location = new System.Drawing.Point(9, 11); this.lbRID.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbRID.Name = "lbRID"; - this.lbRID.Size = new System.Drawing.Size(101, 72); + this.lbRID.Size = new System.Drawing.Size(165, 39); this.lbRID.TabIndex = 19; - this.lbRID.Text = "rid"; - this.lbRID.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lbRID.Text = "RID"; + this.lbRID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // fManualPrint + // fManualPrint0 // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 32F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(618, 502); + this.ClientSize = new System.Drawing.Size(565, 473); this.Controls.Add(this.tbSid); this.Controls.Add(this.lbSID); this.Controls.Add(this.tbQty); this.Controls.Add(this.lbQty); - this.Controls.Add(this.tbPart); + this.Controls.Add(this.tbPartNo); this.Controls.Add(this.lbPart); - this.Controls.Add(this.tbMfg); + this.Controls.Add(this.tbMFGDate); this.Controls.Add(this.lbMFG); - this.Controls.Add(this.tbManu); + this.Controls.Add(this.tbVName); this.Controls.Add(this.lbManu); - this.Controls.Add(this.tbLot); + this.Controls.Add(this.tbVLot); this.Controls.Add(this.lbLot); this.Controls.Add(this.tbRid); this.Controls.Add(this.lbRID); @@ -225,7 +254,7 @@ this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "fManualPrint"; + this.Name = "fManualPrint0"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Make New Reel ID"; this.Load += new System.EventHandler(this.fNewReelID_Load); @@ -240,13 +269,13 @@ private System.Windows.Forms.Label lbSID; private System.Windows.Forms.TextBox tbQty; private System.Windows.Forms.Label lbQty; - private System.Windows.Forms.TextBox tbPart; + private System.Windows.Forms.TextBox tbPartNo; private System.Windows.Forms.Label lbPart; - private System.Windows.Forms.TextBox tbMfg; + private System.Windows.Forms.TextBox tbMFGDate; private System.Windows.Forms.Label lbMFG; - private System.Windows.Forms.TextBox tbManu; + private System.Windows.Forms.TextBox tbVName; private System.Windows.Forms.Label lbManu; - private System.Windows.Forms.TextBox tbLot; + private System.Windows.Forms.TextBox tbVLot; private System.Windows.Forms.Label lbLot; private System.Windows.Forms.TextBox tbRid; private System.Windows.Forms.Label lbRID; diff --git a/Handler/Project/Dialog/fManualPrint0.cs b/Handler/Project/Dialog/fManualPrint0.cs index c871af4..374153b 100644 --- a/Handler/Project/Dialog/fManualPrint0.cs +++ b/Handler/Project/Dialog/fManualPrint0.cs @@ -13,14 +13,75 @@ namespace Project.Dialog { public partial class fManualPrint0 : Form { + public Class.Reel reelinfo = null; public string NewID { get; set; } + + [Flags] + public enum eOpt : byte + { + reelid = 1, + sid = 2, + vlot = 4, + vname = 8, + partno = 16, + qty = 32, + mfg = 64, + } + public fManualPrint0() { InitializeComponent(); + SetControlStates(eOpt.reelid | eOpt.sid | eOpt.vlot | eOpt.vname | eOpt.partno | eOpt.qty | eOpt.mfg); + } + + /// + /// 사용하고자하는 컨트롤을 or 값으로 전달해주세요 + /// + /// + + public fManualPrint0(eOpt enabledOptions) + { + InitializeComponent(); + SetControlStates(enabledOptions); + } + + private void SetControlStates(eOpt enabledOptions) + { + tbRid.Enabled = enabledOptions.HasFlag(eOpt.reelid); + tbRid.BackColor = tbRid.Enabled ? Color.White : Color.LightGray; + + tbSid.Enabled = enabledOptions.HasFlag(eOpt.sid); + tbSid.BackColor = tbSid.Enabled ? Color.White : Color.LightGray; + + tbVLot.Enabled = enabledOptions.HasFlag(eOpt.vlot); + tbVLot.BackColor = tbVLot.Enabled ? Color.White : Color.LightGray; + + tbVName.Enabled = enabledOptions.HasFlag(eOpt.vname); + tbVName.BackColor = tbVName.Enabled ? Color.White : Color.LightGray; + + tbPartNo.Enabled = enabledOptions.HasFlag(eOpt.partno); + tbPartNo.BackColor = tbPartNo.Enabled ? Color.White : Color.LightGray; + + tbQty.Enabled = enabledOptions.HasFlag(eOpt.qty); + tbQty.BackColor = tbQty.Enabled ? Color.White : Color.LightGray; + + tbMFGDate.Enabled = enabledOptions.HasFlag(eOpt.mfg); + tbMFGDate.BackColor = tbMFGDate.Enabled ? Color.White : Color.LightGray; } private void fNewReelID_Load(object sender, EventArgs e) { - + if (PUB.Result != null && PUB.Result.ItemDataC != null) + { + var vdata = PUB.Result.ItemDataC.VisionData; + this.tbRid.Text = vdata.RID; + this.tbVLot.Text = vdata.VLOT; + this.tbVName.Text = vdata.VNAME; + this.tbPartNo.Text = vdata.PARTNO; + this.tbQty.Text = vdata.QTY; + this.tbSid.Text = vdata.SID; + this.tbMFGDate.Text = vdata.MFGDATE; + } + } private void btOK_Click(object sender, EventArgs e) @@ -28,27 +89,27 @@ namespace Project.Dialog int qty = 0; int.TryParse(tbQty.Text, out qty); - string rid, lot, manu, mfg, partnum,sid; - rid = lot = manu = mfg =sid= partnum = ""; - if (tbRid.Text.isEmpty() == false) rid = tbRid.Text.Trim(); - if (tbSid.Text.isEmpty() == false) sid = tbSid.Text.Trim(); - if (tbMfg.Text.isEmpty() == false) mfg = tbMfg.Text.Trim(); - if (tbPart.Text.isEmpty() == false) partnum = tbPart.Text.Trim(); - if (tbLot.Text.isEmpty() == false) lot = tbLot.Text.Trim(); - if (tbManu.Text.isEmpty() == false) manu = tbManu.Text.Trim(); - var rlt = PUB.PrinterR.Print(new Class.Reel + string rid, lot, manu, mfg, partnum, sid; + rid = lot = manu = mfg = sid = partnum = ""; + rid = tbRid.Text.Trim(); + sid = tbSid.Text.Trim(); + mfg = tbMFGDate.Text.Trim(); + partnum = tbPartNo.Text.Trim(); + lot = tbVLot.Text.Trim(); + manu = tbVName.Text.Trim(); + reelinfo = new Class.Reel { id = rid, - lot = lot, - manu = manu, + venderLot = lot, + venderName = manu, mfg = mfg, - partnum =partnum, + PartNo = partnum, qty = qty, - sid = sid, - }, true, false); + SID = sid, + }; + DialogResult = DialogResult.OK; - PUB.log.Add($"manual print:{PUB.PrinterR.qrData}"); } - + } } diff --git a/Handler/Project/Dialog/fSelectJob.cs b/Handler/Project/Dialog/fSelectJob.cs index 54ce72e..01d3a45 100644 --- a/Handler/Project/Dialog/fSelectJob.cs +++ b/Handler/Project/Dialog/fSelectJob.cs @@ -433,7 +433,7 @@ namespace Project.Dialog private void btOK_MouseClick(object sender, MouseEventArgs e) { - Confirm(); + } @@ -541,7 +541,7 @@ namespace Project.Dialog private void btOK_Click(object sender, EventArgs e) { - + Confirm(); } } } diff --git a/Handler/Project/Dialog/fSelectSIDInformation.Designer.cs b/Handler/Project/Dialog/fSelectSIDInformation.Designer.cs new file mode 100644 index 0000000..c05831f --- /dev/null +++ b/Handler/Project/Dialog/fSelectSIDInformation.Designer.cs @@ -0,0 +1,632 @@ +namespace Project.Dialog +{ + partial class fSelectSIDInformation + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSelectSIDInformation)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.tbSID = new System.Windows.Forms.TextBox(); + this.tbLot = new System.Windows.Forms.TextBox(); + this.tbMFG = new System.Windows.Forms.TextBox(); + this.lnkBatch = new System.Windows.Forms.LinkLabel(); + this.tbBatch = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.linkLabel5 = new System.Windows.Forms.LinkLabel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.tbPart = new System.Windows.Forms.TextBox(); + this.linkLabel8 = new System.Windows.Forms.LinkLabel(); + this.TbCustCode = new System.Windows.Forms.TextBox(); + this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.tbVName = new System.Windows.Forms.TextBox(); + this.button5 = new System.Windows.Forms.Button(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.lbExecuteSQL = new System.Windows.Forms.ToolStripStatusLabel(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.dv1 = new System.Windows.Forms.DataGridView(); + this.panDv = new System.Windows.Forms.Panel(); + this.btOK = new System.Windows.Forms.Button(); + this.panel3 = new System.Windows.Forms.Panel(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsWMS = new Project.dsWMS(); + this.ta = new Project.dsWMSTableAdapters.VW_GET_MAX_QTY_VENDOR_LOTTableAdapter(); + this.tam = new Project.dsWMSTableAdapters.TableAdapterManager(); + this.idxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewButtonColumn(); + this.pARTNODataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.vENDORNMDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bATCHNODataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cUSTCODEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.vENDORLOTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.mFGDATEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.qTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.panDv.SuspendLayout(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsWMS)).BeginInit(); + this.SuspendLayout(); + // + // tbSID + // + this.tbSID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbSID.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSID.Location = new System.Drawing.Point(113, 8); + this.tbSID.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbSID.Name = "tbSID"; + this.tbSID.Size = new System.Drawing.Size(288, 31); + this.tbSID.TabIndex = 1; + this.tbSID.Tag = ""; + this.tbSID.Click += new System.EventHandler(this.tbDate_Click); + // + // tbLot + // + this.tbLot.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbLot.Location = new System.Drawing.Point(113, 44); + this.tbLot.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbLot.Name = "tbLot"; + this.tbLot.Size = new System.Drawing.Size(288, 31); + this.tbLot.TabIndex = 1; + this.tbLot.Tag = ""; + this.tbLot.Click += new System.EventHandler(this.tbDate_Click); + // + // tbMFG + // + this.tbMFG.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbMFG.Location = new System.Drawing.Point(502, 80); + this.tbMFG.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbMFG.Name = "tbMFG"; + this.tbMFG.Size = new System.Drawing.Size(239, 31); + this.tbMFG.TabIndex = 3; + this.tbMFG.Tag = ""; + this.tbMFG.Click += new System.EventHandler(this.tbDate_Click); + // + // lnkBatch + // + this.lnkBatch.AutoSize = true; + this.lnkBatch.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.lnkBatch.Location = new System.Drawing.Point(448, 122); + this.lnkBatch.Name = "lnkBatch"; + this.lnkBatch.Size = new System.Drawing.Size(52, 19); + this.lnkBatch.TabIndex = 34; + this.lnkBatch.TabStop = true; + this.lnkBatch.Text = "BATCH"; + this.lnkBatch.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkBatch_LinkClicked); + // + // tbBatch + // + this.tbBatch.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbBatch.Location = new System.Drawing.Point(502, 116); + this.tbBatch.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbBatch.Name = "tbBatch"; + this.tbBatch.Size = new System.Drawing.Size(239, 31); + this.tbBatch.TabIndex = 33; + this.tbBatch.Tag = ""; + // + // button4 + // + this.button4.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.button4.Location = new System.Drawing.Point(349, 79); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(52, 32); + this.button4.TabIndex = 31; + this.button4.Text = "N/A"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click_1); + // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel7.Location = new System.Drawing.Point(41, 86); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(69, 19); + this.linkLabel7.TabIndex = 23; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "PART NO"; + this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); + // + // linkLabel5 + // + this.linkLabel5.AutoSize = true; + this.linkLabel5.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.linkLabel5.Location = new System.Drawing.Point(423, 86); + this.linkLabel5.Name = "linkLabel5"; + this.linkLabel5.Size = new System.Drawing.Size(77, 19); + this.linkLabel5.TabIndex = 23; + this.linkLabel5.TabStop = true; + this.linkLabel5.Text = "MFG DATE"; + this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); + // + // linkLabel3 + // + this.linkLabel3.AutoSize = true; + this.linkLabel3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel3.Location = new System.Drawing.Point(27, 50); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.Size = new System.Drawing.Size(83, 19); + this.linkLabel3.TabIndex = 23; + this.linkLabel3.TabStop = true; + this.linkLabel3.Text = "Vender LOT"; + this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel2.Location = new System.Drawing.Point(79, 14); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(31, 19); + this.linkLabel2.TabIndex = 23; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "SID"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); + // + // tbPart + // + this.tbPart.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbPart.Location = new System.Drawing.Point(113, 80); + this.tbPart.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbPart.Name = "tbPart"; + this.tbPart.Size = new System.Drawing.Size(239, 31); + this.tbPart.TabIndex = 15; + this.tbPart.Tag = ""; + this.tbPart.Click += new System.EventHandler(this.tbDate_Click); + // + // linkLabel8 + // + this.linkLabel8.AutoSize = true; + this.linkLabel8.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel8.Location = new System.Drawing.Point(4, 122); + this.linkLabel8.Name = "linkLabel8"; + this.linkLabel8.Size = new System.Drawing.Size(106, 19); + this.linkLabel8.TabIndex = 28; + this.linkLabel8.TabStop = true; + this.linkLabel8.Text = "Customer Code"; + this.linkLabel8.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel8_LinkClicked); + // + // TbCustCode + // + this.TbCustCode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.TbCustCode.Font = new System.Drawing.Font("맑은 고딕", 11F); + this.TbCustCode.Location = new System.Drawing.Point(113, 118); + this.TbCustCode.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.TbCustCode.Name = "TbCustCode"; + this.TbCustCode.Size = new System.Drawing.Size(288, 27); + this.TbCustCode.TabIndex = 27; + this.TbCustCode.Tag = ""; + // + // linkLabel6 + // + this.linkLabel6.AutoSize = true; + this.linkLabel6.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.linkLabel6.Location = new System.Drawing.Point(405, 50); + this.linkLabel6.Name = "linkLabel6"; + this.linkLabel6.Size = new System.Drawing.Size(95, 19); + this.linkLabel6.TabIndex = 23; + this.linkLabel6.TabStop = true; + this.linkLabel6.Text = "Vender Name"; + this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); + // + // tbVName + // + this.tbVName.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbVName.Location = new System.Drawing.Point(502, 46); + this.tbVName.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbVName.Name = "tbVName"; + this.tbVName.Size = new System.Drawing.Size(185, 27); + this.tbVName.TabIndex = 13; + this.tbVName.Tag = ""; + this.tbVName.Click += new System.EventHandler(this.tbDate_Click); + // + // button5 + // + this.button5.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.button5.Location = new System.Drawing.Point(689, 43); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(52, 32); + this.button5.TabIndex = 34; + this.button5.Text = "N/A"; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click_2); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lbExecuteSQL}); + this.statusStrip1.Location = new System.Drawing.Point(0, 562); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 13, 0); + this.statusStrip1.Size = new System.Drawing.Size(1031, 22); + this.statusStrip1.TabIndex = 11; + this.statusStrip1.Text = "statusStrip1"; + // + // lbExecuteSQL + // + this.lbExecuteSQL.Name = "lbExecuteSQL"; + this.lbExecuteSQL.Size = new System.Drawing.Size(39, 17); + this.lbExecuteSQL.Text = "Query"; + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2}); + this.bn.Location = new System.Drawing.Point(0, 380); + 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(1031, 25); + this.bn.TabIndex = 12; + this.bn.Text = "bindingNavigator1"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(49, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // dv1 + // + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idxDataGridViewTextBoxColumn, + this.sIDDataGridViewTextBoxColumn, + this.pARTNODataGridViewTextBoxColumn, + this.vENDORNMDataGridViewTextBoxColumn, + this.bATCHNODataGridViewTextBoxColumn, + this.cUSTCODEDataGridViewTextBoxColumn, + this.vENDORLOTDataGridViewTextBoxColumn, + this.mFGDATEDataGridViewTextBoxColumn, + this.qTYDataGridViewTextBoxColumn}); + this.dv1.DataSource = this.bs; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle1; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(1031, 380); + this.dv1.TabIndex = 35; + this.dv1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.vW_GET_MAX_QTY_VENDOR_LOTDataGridView_CellClick); + // + // panDv + // + this.panDv.Controls.Add(this.dv1); + this.panDv.Controls.Add(this.bn); + this.panDv.Dock = System.Windows.Forms.DockStyle.Fill; + this.panDv.Location = new System.Drawing.Point(0, 157); + this.panDv.Name = "panDv"; + this.panDv.Size = new System.Drawing.Size(1031, 405); + this.panDv.TabIndex = 36; + // + // btOK + // + this.btOK.BackColor = System.Drawing.Color.DarkSeaGreen; + this.btOK.Dock = System.Windows.Forms.DockStyle.Right; + this.btOK.Font = new System.Drawing.Font("맑은 고딕", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btOK.Location = new System.Drawing.Point(791, 10); + this.btOK.Name = "btOK"; + this.btOK.Size = new System.Drawing.Size(230, 137); + this.btOK.TabIndex = 4; + this.btOK.Text = "SAVE"; + this.btOK.UseVisualStyleBackColor = false; + this.btOK.Click += new System.EventHandler(this.btOK_Click); + // + // panel3 + // + this.panel3.Controls.Add(this.btOK); + this.panel3.Controls.Add(this.button5); + this.panel3.Controls.Add(this.button4); + this.panel3.Controls.Add(this.linkLabel7); + this.panel3.Controls.Add(this.tbVName); + this.panel3.Controls.Add(this.linkLabel5); + this.panel3.Controls.Add(this.linkLabel6); + this.panel3.Controls.Add(this.tbSID); + this.panel3.Controls.Add(this.linkLabel8); + this.panel3.Controls.Add(this.TbCustCode); + this.panel3.Controls.Add(this.tbBatch); + this.panel3.Controls.Add(this.linkLabel3); + this.panel3.Controls.Add(this.tbLot); + this.panel3.Controls.Add(this.lnkBatch); + this.panel3.Controls.Add(this.tbPart); + this.panel3.Controls.Add(this.tbMFG); + this.panel3.Controls.Add(this.linkLabel2); + this.panel3.Dock = System.Windows.Forms.DockStyle.Top; + this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Name = "panel3"; + this.panel3.Padding = new System.Windows.Forms.Padding(0, 10, 10, 10); + this.panel3.Size = new System.Drawing.Size(1031, 157); + this.panel3.TabIndex = 37; + // + // bs + // + this.bs.DataMember = "VW_GET_MAX_QTY_VENDOR_LOT"; + this.bs.DataSource = this.dsWMS; + // + // dsWMS + // + this.dsWMS.DataSetName = "dsWMS"; + this.dsWMS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.Connection = null; + this.tam.UpdateOrder = Project.dsWMSTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // idxDataGridViewTextBoxColumn + // + this.idxDataGridViewTextBoxColumn.DataPropertyName = "idx"; + this.idxDataGridViewTextBoxColumn.HeaderText = "No"; + this.idxDataGridViewTextBoxColumn.Name = "idxDataGridViewTextBoxColumn"; + this.idxDataGridViewTextBoxColumn.ReadOnly = true; + // + // sIDDataGridViewTextBoxColumn + // + this.sIDDataGridViewTextBoxColumn.DataPropertyName = "SID"; + this.sIDDataGridViewTextBoxColumn.HeaderText = "SID"; + this.sIDDataGridViewTextBoxColumn.Name = "sIDDataGridViewTextBoxColumn"; + this.sIDDataGridViewTextBoxColumn.ReadOnly = true; + this.sIDDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.sIDDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // pARTNODataGridViewTextBoxColumn + // + this.pARTNODataGridViewTextBoxColumn.DataPropertyName = "PART_NO"; + this.pARTNODataGridViewTextBoxColumn.HeaderText = "PART_NO"; + this.pARTNODataGridViewTextBoxColumn.Name = "pARTNODataGridViewTextBoxColumn"; + this.pARTNODataGridViewTextBoxColumn.ReadOnly = true; + // + // vENDORNMDataGridViewTextBoxColumn + // + this.vENDORNMDataGridViewTextBoxColumn.DataPropertyName = "VENDOR_NM"; + this.vENDORNMDataGridViewTextBoxColumn.HeaderText = "VENDOR_NM"; + this.vENDORNMDataGridViewTextBoxColumn.Name = "vENDORNMDataGridViewTextBoxColumn"; + this.vENDORNMDataGridViewTextBoxColumn.ReadOnly = true; + // + // bATCHNODataGridViewTextBoxColumn + // + this.bATCHNODataGridViewTextBoxColumn.DataPropertyName = "BATCH_NO"; + this.bATCHNODataGridViewTextBoxColumn.HeaderText = "BATCH_NO"; + this.bATCHNODataGridViewTextBoxColumn.Name = "bATCHNODataGridViewTextBoxColumn"; + this.bATCHNODataGridViewTextBoxColumn.ReadOnly = true; + // + // cUSTCODEDataGridViewTextBoxColumn + // + this.cUSTCODEDataGridViewTextBoxColumn.DataPropertyName = "CUST_CODE"; + this.cUSTCODEDataGridViewTextBoxColumn.HeaderText = "CUST_CODE"; + this.cUSTCODEDataGridViewTextBoxColumn.Name = "cUSTCODEDataGridViewTextBoxColumn"; + this.cUSTCODEDataGridViewTextBoxColumn.ReadOnly = true; + // + // vENDORLOTDataGridViewTextBoxColumn + // + this.vENDORLOTDataGridViewTextBoxColumn.DataPropertyName = "VENDOR_LOT"; + this.vENDORLOTDataGridViewTextBoxColumn.HeaderText = "VENDOR_LOT"; + this.vENDORLOTDataGridViewTextBoxColumn.Name = "vENDORLOTDataGridViewTextBoxColumn"; + this.vENDORLOTDataGridViewTextBoxColumn.ReadOnly = true; + // + // mFGDATEDataGridViewTextBoxColumn + // + this.mFGDATEDataGridViewTextBoxColumn.DataPropertyName = "MFG_DATE"; + this.mFGDATEDataGridViewTextBoxColumn.HeaderText = "MFG_DATE"; + this.mFGDATEDataGridViewTextBoxColumn.Name = "mFGDATEDataGridViewTextBoxColumn"; + this.mFGDATEDataGridViewTextBoxColumn.ReadOnly = true; + // + // qTYDataGridViewTextBoxColumn + // + this.qTYDataGridViewTextBoxColumn.DataPropertyName = "QTY"; + this.qTYDataGridViewTextBoxColumn.HeaderText = "QTY"; + this.qTYDataGridViewTextBoxColumn.Name = "qTYDataGridViewTextBoxColumn"; + this.qTYDataGridViewTextBoxColumn.ReadOnly = true; + // + // fSelectSIDInformation + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1031, 584); + this.Controls.Add(this.panDv); + this.Controls.Add(this.panel3); + this.Controls.Add(this.statusStrip1); + this.DoubleBuffered = true; + this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.Name = "fSelectSIDInformation"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Multi SID Information"; + this.Load += new System.EventHandler(this.fLoaderInfo_Load); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.panDv.ResumeLayout(false); + this.panDv.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsWMS)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.TextBox tbSID; + private System.Windows.Forms.TextBox tbLot; + private System.Windows.Forms.TextBox tbMFG; + private System.Windows.Forms.TextBox tbVName; + private System.Windows.Forms.TextBox tbPart; + private System.Windows.Forms.LinkLabel linkLabel7; + private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.LinkLabel linkLabel5; + private System.Windows.Forms.LinkLabel linkLabel3; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.LinkLabel linkLabel8; + private System.Windows.Forms.TextBox TbCustCode; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.LinkLabel lnkBatch; + private System.Windows.Forms.TextBox tbBatch; + private dsWMS dsWMS; + private System.Windows.Forms.BindingSource bs; + private dsWMSTableAdapters.VW_GET_MAX_QTY_VENDOR_LOTTableAdapter ta; + private dsWMSTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.DataGridView dv1; + private System.Windows.Forms.Panel panDv; + private System.Windows.Forms.Button btOK; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.ToolStripStatusLabel lbExecuteSQL; + private System.Windows.Forms.DataGridViewTextBoxColumn idxDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewButtonColumn sIDDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pARTNODataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn vENDORNMDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn bATCHNODataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn cUSTCODEDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn vENDORLOTDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn mFGDATEDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn qTYDataGridViewTextBoxColumn; + } +} \ No newline at end of file diff --git a/Handler/Project/Dialog/fSelectSIDInformation.cs b/Handler/Project/Dialog/fSelectSIDInformation.cs new file mode 100644 index 0000000..2528318 --- /dev/null +++ b/Handler/Project/Dialog/fSelectSIDInformation.cs @@ -0,0 +1,888 @@ +using AR; +using SATOPrinterAPI; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Data.SqlClient; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web.UI.WebControls.WebParts; +using System.Windows.Forms; +using System.Windows.Forms.VisualStyles; + +namespace Project.Dialog +{ + public partial class fSelectSIDInformation : Form + { + Boolean autoconf = false; + Boolean warn = false; + Boolean samesidwarn = false; + bool NewReelId = false; + public fSelectSIDInformation() + { + InitializeComponent(); + VAR.BOOL[eVarBool.FG_WAIT_INFOSELECT] = true; + this.WindowState = FormWindowState.Normal; + var sql = VAR.STR[eVarString.MULTISID_QUERY]; + var fields = VAR.STR[eVarString.MULTISID_FIELDS]; + this.lbExecuteSQL.Text = sql; + this.FormClosed += FLoaderInfo_FormClosed; + } + + + private void FLoaderInfo_FormClosed(object sender, FormClosedEventArgs e) + { + VAR.BOOL[eVarBool.FG_WAIT_INFOSELECT] = false; + PUB.Result.ItemDataC.VisionData.PropertyChanged -= VisionData_PropertyChanged; + + ////사용자가 정보를 정확히 입력하지 않고 닫았다 + //if (PUB.Result.ItemDataC.VisionData.Confirm == false) + //{ + // if (PUB.sm.Step == eSMStep.RUN) + // PUB.Result.SetResultMessage(eResult.OPERATION, eECode.INCOMPLETE_INFOSELECT, eNextStep.PAUSE, 1); + //} + } + + private void fLoaderInfo_Load(object sender, EventArgs e) + { + var sql = VAR.STR[eVarString.MULTISID_QUERY]; + var fields = VAR.STR[eVarString.MULTISID_FIELDS]; + + try + { + var cn = DBHelper.GetConnection(); + var cmd = new SqlCommand(sql, cn); + var da = new SqlDataAdapter(cmd); + var dt = new DataTable(); + da.Fill(dt); + int i = 0; + this.dsWMS.VW_GET_MAX_QTY_VENDOR_LOT.Clear(); + foreach (DataRow dr in dt.Rows) + { + var newdr = this.dsWMS.VW_GET_MAX_QTY_VENDOR_LOT.NewVW_GET_MAX_QTY_VENDOR_LOTRow(); + newdr.idx = dsWMS.VW_GET_MAX_QTY_VENDOR_LOT.Count + 1; + if (dt.Columns.Contains("SID")) newdr.SID = dr["SID"]?.ToString() ?? string.Empty; + else newdr.SID = string.Empty; + if (dt.Columns.Contains("PART_NO")) newdr.PART_NO = dr["PART_NO"]?.ToString() ?? string.Empty; + else newdr.PART_NO = string.Empty; + if (dt.Columns.Contains("VENDOR_LOT")) newdr.VENDOR_LOT = dr["VENDOR_LOT"]?.ToString() ?? string.Empty; + else newdr.VENDOR_LOT = string.Empty; + if (dt.Columns.Contains("VENDOR_NM")) newdr.VENDOR_NM = dr["VENDOR_NM"]?.ToString() ?? string.Empty; + else newdr.VENDOR_NM = string.Empty; + if (dt.Columns.Contains("BATCH_NO")) newdr.BATCH_NO = dr["BATCH_NO"]?.ToString() ?? string.Empty; + else newdr.BATCH_NO = string.Empty; + if (dt.Columns.Contains("CUST_CODE")) newdr.CUST_CODE = dr["CUST_CODE"]?.ToString() ?? string.Empty; + else newdr.CUST_CODE = string.Empty; + if (dt.Columns.Contains("MFG_DATE")) newdr.MFG_DATE = dr["MFG_DATE"]?.ToString() ?? string.Empty; + else newdr.MFG_DATE = string.Empty; + if (dt.Columns.Contains("QTY")) newdr.QTY = (dr["QTY"]?.ToString() ?? "0").toInt(); + else newdr.QTY = 0; + + + this.dsWMS.VW_GET_MAX_QTY_VENDOR_LOT.AddVW_GET_MAX_QTY_VENDOR_LOTRow(newdr);//?.ToString() ?? + //string.Empty; + } + + dsWMS.VW_GET_MAX_QTY_VENDOR_LOT.AcceptChanges(); + //this.dv1.DataSource = null; + //this.dv1.Rows.Clear(); + //this.dv1.Columns.Clear(); + + //var cols = new String[] { "No", "SID", "PartNo", "VendorLot", "VendorName", "MFGDate", "Qty" }; + //foreach (var colname in cols) + // this.dv1.Columns.Add($"col_{colname}", colname); + + //foreach (dsWMS.VW_GET_MAX_QTY_VENDOR_LOTRow row in dsWMS.VW_GET_MAX_QTY_VENDOR_LOT) + //{ + // this.dv1.Rows.Add(new string[] { }); + //} + } + catch (Exception ex) + { + UTIL.MsgE($"Data Query Error\n{ex.Message}"); + } + + //현재 바코드가 읽었단 자료를 모두 표시한다. + var item = PUB.Result.ItemDataC; + NewReelId = item.VisionData.RIDNew; + tbSID.Text = item.VisionData.SID; + tbLot.Text = item.VisionData.VLOT; + tbMFG.Text = item.VisionData.MFGDATE; + tbVName.Text = item.VisionData.VNAME; + tbPart.Text = item.VisionData.PARTNO; + TbCustCode.Text = item.VisionData.CUSTCODE; + tbBatch.Text = item.VisionData.BATCH; + + + selectInput(this.tbSID); + + if (tbVName.Text.isEmpty()) + if (PUB.Result.vModel.Def_Vname.isEmpty() == false) + tbVName.Text = PUB.Result.vModel.Def_Vname; + + if (tbMFG.Text.isEmpty()) + if (PUB.Result.vModel.Def_MFG.isEmpty() == false) + tbMFG.Text = PUB.Result.vModel.Def_MFG; + + item.VisionData.PropertyChanged += VisionData_PropertyChanged; + + this.Show(); + this.dv1.AutoResizeColumns(); + } + + delegate void UpdateTextHandler(Control ctrl, string value); + public void UpdateText(Control ctrl, string value) + { + if (ctrl is Label || ctrl is TextBox) + { + if (ctrl.InvokeRequired) + { + ctrl.BeginInvoke(new UpdateTextHandler(UpdateText), new object[] { ctrl, value }); + } + else if (ctrl is Label) + ((Label)ctrl).Text = value; + else if (ctrl is TextBox) + ((TextBox)ctrl).Text = value; + } + + } + + private void VisionData_PropertyChanged(object sender, PropertyChangedEventArgs e) + { + //값이 바뀌었으나 현재 값이 입력되지 않았따면 처리해준다. 220712 + var item = PUB.Result.ItemDataC; + + if (e.PropertyName.Equals("MFGDATE") && tbMFG.Text.isEmpty()) + UpdateText(tbMFG, item.VisionData.MFGDATE); + + if (e.PropertyName.Equals("VNAME") && tbVName.Text.isEmpty()) + UpdateText(tbVName, item.VisionData.VNAME); + + if (e.PropertyName.Equals("PARTNO") && tbPart.Text.isEmpty()) + UpdateText(tbPart, item.VisionData.PARTNO); + + if (e.PropertyName.Equals("CUSTCODE") && TbCustCode.Text.isEmpty()) + UpdateText(TbCustCode, item.VisionData.CUSTCODE); //210317 + + if (e.PropertyName.Equals("SID") && tbSID.Text.isEmpty()) + UpdateText(tbSID, item.VisionData.SID); + + if (e.PropertyName.Equals("VLOT") && tbLot.Text.isEmpty()) + UpdateText(tbLot, item.VisionData.VLOT); + } + + + string TagStr = string.Empty; + void selectInput(Control c) + { + TagStr = string.Empty; + if (c is TextBox) + { + var tb = c as TextBox; + TagStr = tb.Tag.ToString(); + } + else if (c is Label) + { + var lb = c as Label; + TagStr = lb.Tag.ToString(); + } + + //동일태그를 가진 textbox 의 배경색을 업데이트한다 + foreach (Control tb in panel3.Controls) + { + if (tb is TextBox) + { + if (tb.Tag.ToString() == TagStr) + { + tb.BackColor = Color.SkyBlue; + } + else tb.BackColor = SystemColors.Control; + } + } + } + + + + + private void tbDate_Click(object sender, EventArgs e) + { + selectInput(sender as TextBox); + } + + private void button4_Click(object sender, EventArgs e) + { + DateTime dt = DateTime.Now; + var dtstr = this.tbMFG.Text.Trim().Replace("-", "").Replace("/", ""); + if (dtstr.Length == 8) + { + dt = new DateTime( + int.Parse(dtstr.Substring(0, 4)), + int.Parse(dtstr.Substring(4, 2)), + int.Parse(dtstr.Substring(6, 2))); + } + + var f = new Dialog.fSelectDay(dt); + if (f.ShowDialog() == DialogResult.OK) + { + this.tbMFG.Text = f.dt.ToShortDateString(); + } + } + + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(tbSID, "INPUT SID"); + } + + private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(tbLot, "INPUT VENDER LOT"); + } + + private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(tbMFG, "INPUT MFG DATE"); + } + + private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(tbVName, "INPUT SUPPLY NAME"); + } + + private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //tbpartno + UTIL.TouchKeyShow(tbPart, "INPUT CUSTOMER PART NO."); + } + + + private void linkLabel8_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(TbCustCode, "INPUT SUPPLY CODE"); + } + + + private void btOK_Click(object sender, EventArgs e) + { + bool topmost = this.TopMost; + //var IsBypas = VAR.STR[eVarString.JOB_TYPE] == "BP"; + if (System.Diagnostics.Debugger.IsAttached) + this.TopMost = false; + + var itemC = PUB.Result.ItemDataC; + + //manu 목록에 없다면 추가 해준다. + var manuName = tbVName.Text.Trim().ToLower(); + if (manuName.isEmpty() == false) + { + lock (PUB.Result.dsList) + { + if (PUB.Result.dsList.Supply.Where(t => t.TITLE.ToLower() == manuName).Any() == false) + { + //기존 manu 목록에 없으니 추가한다. + var newdr = PUB.Result.dsList.Supply.NewSupplyRow(); + newdr.TITLE = tbVName.Text.Trim(); + PUB.Result.dsList.Supply.AddSupplyRow(newdr); + PUB.Result.SaveListDB(); + } + } + } + + //필수값 입력 확인 + #region "Check iNput Data" + if (tbSID.Text.isEmpty()) + { + UTIL.MsgE("SID 가 입력되지 않았습니다"); + tbSID.Focus(); + return; + } + + //if (tbLot.Text.isEmpty()) + //{ + // UTIL.MsgE("VLOT 가 입력되지 않았습니다"); + // tbLot.Focus(); + // return; + //} + + //if (tbMFG.Text.isEmpty()) + //{ + // UTIL.MsgE("MFG-DATE 가 입력되지 않았습니다"); + // tbMFG.Focus(); + // return; + //} + + //if (this.tbPart.Text.isEmpty()) + //{ + // UTIL.MsgE("PART No 가 입력되지 않았습니다"); + // tbPart.Focus(); + // return; + //} + + #endregion + + //현재 작업모드와 SID가 일치하는지 확인한다. + var sidNew = this.tbSID.Text.Trim(); + var partNo = this.tbPart.Text.Trim(); + var custCode = this.TbCustCode.Text.Trim(); + + //모든자료는 존재한다 저장가능하다 + if (AR.SETTING.Data.OnlineMode) + { + //시드정보테이블의 데이터를 역으로 저장한 경우 + if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && VAR.BOOL[eVarBool.Opt_SID_WriteServer]) + { + Dictionary wheres = new Dictionary(); + Dictionary columns = new Dictionary(); + + //조건절생성 + if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) wheres.Add("CustCode", TbCustCode.Text); + if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) wheres.Add("PartNo", tbPart.Text); + if (VAR.BOOL[eVarBool.Opt_SID_Where_SID]) wheres.Add("SID", tbSID.Text); + if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) wheres.Add("VenderLot", tbLot.Text); + + //Make Target COlumns + if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode]) columns.Add("CustCode", TbCustCode.Text); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo]) columns.Add("PartNo", tbPart.Text); + //if (VAR.BOOL[eVarBool.Opt_SID_Apply_PrintPos]) columns.Add("PrintPosition", this.PrintPos); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID]) + { + //SID변환기능이 동작한상태에서는 변환된 SID정보를 저장하지 않는다 230510 + if (VAR.BOOL[eVarBool.Opt_SIDConvert]) + { + PUB.log.AddAT($"SID변환기능사용으로인해 SID정보는 업데이트하지 않습니다"); + } + else columns.Add("SID", tbSID.Text); + } + if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName]) columns.Add("VenderName", tbVName.Text); + + //EE-SID정보에 데이터를 저장한다 + ServerWriteINF_EED(columns, wheres); + //ServerWriteINF_WMS(columns, wheres); + } + } + + //값을 설정해주고 빠져나간다 + if (tbSID.Text.isEmpty() && + itemC.VisionData.SID.isEmpty() == false && + itemC.VisionData.SID.Equals(tbSID.Text.Trim()) == false) + itemC.VisionData.SID0 = itemC.VisionData.SID; + + //값이있는것들만 기록해준다. + if (tbSID.Text.isEmpty() == false) itemC.VisionData.SID = tbSID.Text.Trim(); + if (tbBatch.Text.isEmpty() == false) itemC.VisionData.BATCH = tbBatch.Text.Trim(); + if (tbLot.Text.isEmpty() == false) itemC.VisionData.VLOT = tbLot.Text.Trim(); + if (tbMFG.Text.isEmpty() == false) itemC.VisionData.MFGDATE = tbMFG.Text.Trim(); + if (tbVName.Text.isEmpty() == false) itemC.VisionData.VNAME = tbVName.Text.Trim(); + if (tbPart.Text.isEmpty() == false) itemC.VisionData.PARTNO = tbPart.Text.Trim(); + + this.TopMost = topmost; + this.Close(); + } + + + /// + /// 지정한 자료를 서버에 기록합니다. 조건절과 대상 열을 제공해야합니다 + /// + void ServerWriteINF_WMS(Dictionary columns, Dictionary wheres) + { + //변경된 값만 저장여부를 확인할 것이므로 기존 값을 모두 가져온다 + var SQL = "select top 1 " + string.Join(",", columns.Select(t => "isnull([" + t.Key + "],'') as " + t.Key + "")) + + " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)"; + + var WSQL = $" where MC='{PUB.MCCode}'"; + for (int i = 0; i < wheres.Count; i++) + { + var col = wheres.ElementAt(i); + var colname = col.Key; + var colvalue = col.Value; + WSQL += " AND "; + WSQL += $" {colname}='{colvalue.Replace("'", "''")}'"; + } + SQL += WSQL; + + Dictionary UpdateTarget = new Dictionary(); + var CN = new System.Data.SqlClient.SqlConnection(); + CN.ConnectionString = Properties.Settings.Default.CS; + var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); + CN.Open(); + var DAR = CMD.ExecuteReader(); + var NoData = true; + Dictionary InsertTarget = new Dictionary(); + while (DAR.Read()) + { + NoData = false; + foreach (var col in columns) + { + var vStr = DAR[col.Key].ToString(); + var cStr = col.Value; + if (vStr.Equals(cStr) == false) + { + //differenct value + UpdateTarget.Add(col.Key, cStr); + } + } + } + DAR.Close(); + //자료가 없다면 데이터를 추가한다. + if (NoData) + { + foreach (var col in columns) + { + InsertTarget.Add(col.Key, col.Value); + } + foreach (var item in wheres) + { + if (InsertTarget.ContainsKey(item.Key) == false) + InsertTarget.Add(item.Key, item.Value); + } + } + + if (UpdateTarget.Count > 0) //if update target + { + + var dlgMsg = $"다음 값을 서버(SID정보)에 저장 하시겠습니까?\n"; + foreach (var item in UpdateTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + + //check double data 220706 + var CSQL = "select count(*) from Component_Reel_SID_Information WITH(NOLOCK) "; + CSQL += WSQL; + CMD.CommandText = CSQL; + var cnt = int.Parse(CMD.ExecuteScalar().ToString()); + var whke = string.Join(",", wheres.Select(t => t.Key).ToList()); + if (cnt < 1) + { + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 정보가 없어 정보를 업데이트 할 수 없습니다\n" + whke); + } + else if (cnt > 1) + { + + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 정보가 복수로({cnt}건) 존재하여 정보를 업데이트 할 수 없습니다\n" + whke); + } + else + { + var USQL = $"update Component_Reel_SID_Information set [MC]='{PUB.MCCode}'," + + string.Join(",", UpdateTarget.Select(t => "[" + t.Key + "]='" + t.Value + "'")); + + USQL += WSQL; + try + { + CMD.CommandText = USQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("Save Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("Save Error\n" + ex.Message); + } + } + } + } + if (InsertTarget.Count > 0) + { + + var dlgMsg = $"다음 값을 서버에 저장 하시겠습니까?\n"; + foreach (var item in InsertTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + var ISQL = $"insert into Component_Reel_SID_Information ([MC],wdate," + + string.Join(",", InsertTarget.Select(t => "[" + t.Key + "]")) + ") values(" + + $"'{PUB.MCCode}',getdate()," + + string.Join(",", InsertTarget.Select(t => "'" + t.Value.Replace("'", "''") + "'")) + ")"; + + //ISQL += WSQL; + try + { + CMD.CommandText = ISQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("Save Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("Save Error\n" + ex.Message); + } + } + + } + CN.Close(); + CN.Dispose(); + } + + /// + /// 지정한 자료를 서버에 기록합니다. 조건절과 대상 열을 제공해야합니다 + /// + void ServerWriteINF_EED(Dictionary columns, Dictionary wheres) + { + //변경된 값만 저장여부를 확인할 것이므로 기존 값을 모두 가져온다 + var SQL = "select top 1 " + string.Join(",", columns.Select(t => "isnull([" + t.Key + "],'') as " + t.Key + "")) + + " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)"; + + var WSQL = $" where MC='{PUB.MCCode}'"; + for (int i = 0; i < wheres.Count; i++) + { + var col = wheres.ElementAt(i); + var colname = col.Key; + var colvalue = col.Value; + WSQL += " AND "; + WSQL += $" {colname}='{colvalue.Replace("'", "''")}'"; + } + SQL += WSQL; + + Dictionary UpdateTarget = new Dictionary(); + var CN = new System.Data.SqlClient.SqlConnection(); + CN.ConnectionString = Properties.Settings.Default.CS; + var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); + CN.Open(); + var DAR = CMD.ExecuteReader(); + var NoData = true; + Dictionary InsertTarget = new Dictionary(); + while (DAR.Read()) + { + NoData = false; + foreach (var col in columns) + { + var vStr = DAR[col.Key].ToString(); + var cStr = col.Value; + if (vStr.Equals(cStr) == false) + { + //differenct value + UpdateTarget.Add(col.Key, cStr); + } + } + } + DAR.Close(); + //자료가 없다면 데이터를 추가한다. + if (NoData) + { + foreach (var col in columns) + { + InsertTarget.Add(col.Key, col.Value); + } + foreach (var item in wheres) + { + if (InsertTarget.ContainsKey(item.Key) == false) + InsertTarget.Add(item.Key, item.Value); + } + } + + if (UpdateTarget.Count > 0) //if update target + { + var dlgMsg = $"다음 값을 EED서버(SID정보)에 저장 하시겠습니까?\n"; + foreach (var item in UpdateTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + //check double data 220706 + var CSQL = "select count(*) from K4EE_Component_Reel_SID_Information WITH(NOLOCK) "; + CSQL += WSQL; + CMD.CommandText = CSQL; + var cnt = int.Parse(CMD.ExecuteScalar().ToString()); + var whke = string.Join(",", wheres.Select(t => t.Key).ToList()); + if (cnt < 1) + { + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 정보가 없어 정보를 업데이트 할 수 없습니다\n" + whke); + } + else if (cnt > 1) + { + + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 정보가 복수로({cnt}건) 존재하여 정보를 업데이트 할 수 없습니다\n" + whke); + } + else + { + var USQL = $"update K4EE_Component_Reel_SID_Information set [MC]='{PUB.MCCode}'," + + string.Join(",", UpdateTarget.Select(t => "[" + t.Key + "]='" + t.Value + "'")); + + USQL += WSQL; + try + { + CMD.CommandText = USQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("Save Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("Save Error\n" + ex.Message); + } + } + } + } + if (InsertTarget.Count > 0) + { + var dlgMsg = $"다음 값을 EED서버에 저장 하시겠습니까?\n"; + foreach (var item in InsertTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + var ISQL = $"insert into K4EE_Component_Reel_SID_Information ([MC],wdate," + + string.Join(",", InsertTarget.Select(t => "[" + t.Key + "]")) + ") values(" + + $"'{PUB.MCCode}',getdate()," + + string.Join(",", InsertTarget.Select(t => "'" + t.Value.Replace("'", "''") + "'")) + ")"; + + //ISQL += WSQL; + try + { + CMD.CommandText = ISQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("Save(EED) Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("Save(EED) Error\n" + ex.Message); + } + } + + } + CN.Close(); + CN.Dispose(); + } + /// + /// 지정한 자료를 서버에 기록합니다. 조건절과 대상 열을 제공해야합니다 + /// + void ServerWriteCNV(Dictionary columns, Dictionary wheres) + { + //변경된 값만 저장여부를 확인할 것이므로 기존 값을 모두 가져온다 + var tableName = "Component_Reel_SID_Convert"; + var SQL = "select top 1 " + string.Join(",", columns.Select(t => "isnull([" + t.Key + "],'') as " + t.Key + "")) + + $" from {tableName} WITH(NOLOCK) "; + + var WSQL = $" where isnull(MC,'{PUB.MCCode}')='{PUB.MCCode}'"; + for (int i = 0; i < wheres.Count; i++) + { + var col = wheres.ElementAt(i); + var colname = col.Key; + var colvalue = col.Value; + WSQL += " AND "; + WSQL += $" {colname}='{colvalue.Replace("'", "''")}'"; + } + SQL += WSQL; + + Dictionary UpdateTarget = new Dictionary(); + var CN = new System.Data.SqlClient.SqlConnection(); + CN.ConnectionString = Properties.Settings.Default.CS; + var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); + CN.Open(); + var DAR = CMD.ExecuteReader(); + var NoData = true; + Dictionary InsertTarget = new Dictionary(); + while (DAR.Read()) + { + NoData = false; + foreach (var col in columns) + { + var vStr = DAR[col.Key].ToString(); + var cStr = col.Value; + if (vStr.Equals(cStr) == false) + { + //differenct value + UpdateTarget.Add(col.Key, cStr); + } + } + } + DAR.Close(); + + //자료가 없다면 데이터를 추가한다. + if (NoData) + { + foreach (var col in columns) + { + InsertTarget.Add(col.Key, col.Value); + } + foreach (var item in wheres) + { + if (InsertTarget.ContainsKey(item.Key) == false) + InsertTarget.Add(item.Key, item.Value); + } + } + + if (UpdateTarget.Count > 0) //if update target + { + + var dlgMsg = $"다음 SID변환값을 서버에 업데이트 하시겠습니까?\n"; + foreach (var item in UpdateTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + + //check double data 220706 + var CSQL = $"select count(*) from {tableName}"; + CSQL += WSQL; + CMD.CommandText = CSQL; + var cnt = int.Parse(CMD.ExecuteScalar().ToString()); + var whke = string.Join(",", wheres.Select(t => t.Key).ToList()); + if (cnt < 1) + { + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 정보가 없어 변환정보를 업데이트 할 수 없습니다\n" + whke); + } + else if (cnt > 1) + { + + PUB.log.AddAT("SQL=" + CSQL); + UTIL.MsgE($"대상 릴 변환정보가 복수로({cnt}건) 존재하여 정보를 업데이트 할 수 없습니다\n" + whke); + } + else + { + var USQL = $"update {tableName} set isnull([MC],'{PUB.MCCode}')='{PUB.MCCode}'," + + string.Join(",", UpdateTarget.Select(t => "[" + t.Key + "]='" + t.Value + "'")); + + USQL += WSQL; + try + { + CMD.CommandText = USQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("(CNV)Save Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("(CNV)Save Error\n" + ex.Message); + } + } + } + } + if (InsertTarget.Count > 0) + { + + var dlgMsg = $"다음 변환값을 서버에 추가 하시겠습니까?\n"; + foreach (var item in InsertTarget) + dlgMsg += $"항목:{item.Key} => {item.Value}\n"; + + + var dlg = UTIL.MsgQ(dlgMsg); + if (dlg == DialogResult.Yes) + { + var ISQL = $"insert into {tableName} ([MC]," + + string.Join(",", InsertTarget.Select(t => "[" + t.Key + "]")) + ") values(" + + $"'{PUB.MCCode}'," + + string.Join(",", InsertTarget.Select(t => "'" + t.Value.Replace("'", "''") + "'")) + ")"; + + //ISQL += WSQL; + try + { + CMD.CommandText = ISQL; + var UpdateOK = CMD.ExecuteNonQuery() == 1; + if (UpdateOK == false) + { + UTIL.MsgE("Save(CNV) Error"); + } + } + catch (Exception ex) + { + UTIL.MsgE("Save(CNV) Error\n" + ex.Message); + } + } + + } + CN.Close(); + CN.Dispose(); + + if (UpdateTarget.Any() || InsertTarget.Any()) + { + PUB.GetSIDConverDB(); + } + } + + private void button4_Click_1(object sender, EventArgs e) + { + if (tbPart.Text.isEmpty()) tbPart.Text = "N/A"; + else + { + var dlg = UTIL.MsgQ("현재 Part No 값을 N/A로 변경 할까요?"); + if (dlg == DialogResult.Yes) tbPart.Text = "N/A"; + } + } + + + + private void button5_Click_2(object sender, EventArgs e) + { + if (tbVName.Text.isEmpty()) tbVName.Text = "N/A"; + else + { + var dlg = UTIL.MsgQ("현재 VenderName 값을 N/A로 변경 할까요?"); + if (dlg == DialogResult.Yes) tbVName.Text = "N/A"; + } + } + + private void lnkBatch_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + UTIL.TouchKeyShow(tbBatch, "INPUT BATCH"); + } + + void ValueUpdate(TextBox tb, string value, string colname) + { + var tagstring = tb.Tag?.ToString() ?? string.Empty; + if (value.isEmpty() == false) + { + tb.Tag = tb.Text; + tb.Text = value; + } + //else if (tagstring.isEmpty() == false && value.isEmpty() == false && tb.Text != value) + //{ + // //한번설정된 값인데 다른 값을 선택했다 + // if (UTIL.MsgQ($"{colname} 값을 변경할까요?\n{tb.Text} -> {value}") == DialogResult.Yes) + // { + // tb.Text = value; + // } + + //} + } + + + private void vW_GET_MAX_QTY_VENDOR_LOTDataGridView_CellClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex < 0 || e.ColumnIndex < 0) return; + var col = this.dv1.Columns[e.ColumnIndex]; + if (col.DataPropertyName.Equals("SID") == false) return; + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsWMS.VW_GET_MAX_QTY_VENDOR_LOTRow; + if (dr == null) return; + + var dlg = UTIL.MsgQ("선택항 항목의 값을 입력할까요?\n비어있는 값은 자동으로 입력하고 이미 존재하는 경우에는 사용자 확인을 합니다"); + if (dlg != DialogResult.Yes) return; + + //SID값은 반드시 있다 + ValueUpdate(tbSID, dr.SID, "SID"); + ValueUpdate(tbLot, dr.VENDOR_LOT, "LOT"); + ValueUpdate(tbPart, dr.PART_NO, "PARTNO"); + ValueUpdate(TbCustCode, dr.CUST_CODE, "CUST_CODE"); + ValueUpdate(tbVName, dr.VENDOR_NM, "VENDER_NM"); + ValueUpdate(tbMFG, dr.MFG_DATE, "MFG_DATE"); + ValueUpdate(tbBatch, dr.BATCH_NO, "BATCH_NO"); + } + } +} \ No newline at end of file diff --git a/Handler/Project/Dialog/fSelectSIDInformation.resx b/Handler/Project/Dialog/fSelectSIDInformation.resx new file mode 100644 index 0000000..8bd6858 --- /dev/null +++ b/Handler/Project/Dialog/fSelectSIDInformation.resx @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 247, 17 + + + 664, 17 + + + 459, 17 + + + 364, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + 525, 17 + + + 589, 17 + + \ No newline at end of file diff --git a/Handler/Project/Language/Lang.cs b/Handler/Project/Language/Lang.cs index 7d09dc1..7766c9f 100644 --- a/Handler/Project/Language/Lang.cs +++ b/Handler/Project/Language/Lang.cs @@ -100,7 +100,7 @@ namespace Project public static bool Loading(string langName) { Lang.SelectedLang = langName; - iniHelper = new arUtil.INIHelper(FileName); + iniHelper = new AR.INIHelper(FileName); int i = 1; @@ -172,7 +172,7 @@ namespace Project { return Loading(SelectedLang); } - private static arUtil.INIHelper iniHelper; + private static AR.INIHelper iniHelper; private static string GetINIValue(string key, string def = "") { if (!System.IO.File.Exists(Lang.FileName)) diff --git a/Handler/Project/Manager/DBHelper.cs b/Handler/Project/Manager/DBHelper.cs index dd5c41e..57d865a 100644 --- a/Handler/Project/Manager/DBHelper.cs +++ b/Handler/Project/Manager/DBHelper.cs @@ -18,6 +18,27 @@ namespace Project return new SqlConnection(cs); } + public static object ExecuteScalar(string sql, params SqlParameter[] p) + { + var cn = GetConnection(); + try + { + var cmd = new SqlCommand(sql, cn); + if (p != null) cmd.Parameters.AddRange(p); + cn.Open(); + return cmd.ExecuteScalar(); + } + catch (Exception ex) + { + // 예외 처리 (필요에 따라 로깅 추가) + return null; + } + finally + { + if (cn != null && cn.State != ConnectionState.Closed) + cn.Close(); + } + } public static int ExecuteNonQuery(string sql, params SqlParameter[] p) diff --git a/Handler/Project/Manager/DataBaseManagerCount.cs b/Handler/Project/Manager/DataBaseManagerCount.cs index d97a1a4..1451018 100644 --- a/Handler/Project/Manager/DataBaseManagerCount.cs +++ b/Handler/Project/Manager/DataBaseManagerCount.cs @@ -44,7 +44,7 @@ namespace Project.Manager public Boolean UpdateCountDate(DateTime jobStartTime, int shutIndex, int slotIndex, int count = 1) { //대상파일을 설정한다. - var fileName = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "Count", + var fileName = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "Count", jobStartTime.Year.ToString("0000"), jobStartTime.Month.ToString("00"), jobStartTime.Day.ToString("00"), @@ -132,7 +132,7 @@ namespace Project.Manager //파일이 없다면 생성한다 var fi = new System.IO.FileInfo(filename); if (fi.Directory.Exists == false) fi.Directory.Create(); - var xml = new arUtil.XMLHelper(fi.FullName); + var xml = new AR.XMLHelper(fi.FullName); if (xml.Exist() == false) xml.CreateFile(); var str_new = xml.get_Data(keyname,"cnt_new"); @@ -224,7 +224,7 @@ namespace Project.Manager //년도데이터가없다면 처리안함 if (System.IO.File.Exists(fi)) { - var xmlYear = new arUtil.XMLHelper(fi); + var xmlYear = new AR.XMLHelper(fi); var str_new = xmlYear.get_Data(appkey,"cnt_new"); var str_good = xmlYear.get_Data(appkey, "cnt_good"); var str_over = xmlYear.get_Data(appkey, "cnt_over"); @@ -254,7 +254,7 @@ namespace Project.Manager try { - var xml = new arUtil.XMLHelper(fileName); + var xml = new AR.XMLHelper(fileName); var newCount = count; if (fi.Exists == false) { @@ -339,7 +339,7 @@ namespace Project.Manager { try { - var xml = new arUtil.XMLHelper(file.FullName); + var xml = new AR.XMLHelper(file.FullName); var id = xml.get_Data("id"); int curCnt; var cntStr = xml.get_Data("count"); diff --git a/Handler/Project/Manager/DatabaseManagerSIDHistory.cs b/Handler/Project/Manager/DatabaseManagerSIDHistory.cs index 06dd8aa..af03a17 100644 --- a/Handler/Project/Manager/DatabaseManagerSIDHistory.cs +++ b/Handler/Project/Manager/DatabaseManagerSIDHistory.cs @@ -56,7 +56,7 @@ namespace Project.Manager void MakeFile(string filename) { //파일이없다면 헤더를 만들어준다. - var xml = new arUtil.XMLHelper(filename); + var xml = new AR.XMLHelper(filename); xml.CreateFile(); } @@ -82,7 +82,7 @@ namespace Project.Manager public string GetFileName(string jobseqdate, string jobseqno, string sid) { - var saveFileName = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, baseDirName, + var saveFileName = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), baseDirName, jobseqdate.Substring(0, 4), jobseqdate.Substring(4, 2), jobseqdate.Substring(6, 2), @@ -112,7 +112,7 @@ namespace Project.Manager // dr.time_lotstart.Year, dr.time_lotstart.Month, dr.time_lotstart.Day, dr.info_lot,dr.info_stripid); //작업이 시작한 시간으로 데이터 파일을 저장해야함 - var saveFileName = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, baseDirName, + var saveFileName = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), baseDirName, dr.seqdate.Substring(0, 4), dr.seqdate.Substring(4, 2), dr.seqdate.Substring(6, 2), @@ -206,7 +206,7 @@ namespace Project.Manager public System.IO.FileInfo[] Getfiles(string seqdate, string seqno) { - var path = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, baseDirName, + var path = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), baseDirName, seqdate.Substring(0, 4), seqdate.Substring(4, 2), seqdate.Substring(6, 2)); diff --git a/Handler/Project/Properties/Resources.Designer.cs b/Handler/Project/Properties/Resources.Designer.cs index 981d353..a8f1bf2 100644 --- a/Handler/Project/Properties/Resources.Designer.cs +++ b/Handler/Project/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Project.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -80,6 +80,16 @@ namespace Project.Properties { } } + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap arrow_refresh_small { + get { + object obj = ResourceManager.GetObject("arrow_refresh_small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. /// @@ -110,6 +120,16 @@ namespace Project.Properties { } } + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap copy { + get { + object obj = ResourceManager.GetObject("copy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. /// diff --git a/Handler/Project/Properties/Resources.resx b/Handler/Project/Properties/Resources.resx index cb26077..82e4fa7 100644 --- a/Handler/Project/Properties/Resources.resx +++ b/Handler/Project/Properties/Resources.resx @@ -130,6 +130,9 @@ ..\Resources\icons8-laser-beam-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-zoom-in-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-add-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,12 +151,12 @@ ..\Resources\icons8-new-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-unavailable-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-zoom-to-extents-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-move-right-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,11 +181,8 @@ ..\Resources\icons8-copy-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-green-circle-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-save-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-zoom-to-extents-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-light-on-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,8 +190,8 @@ ..\Resources\icons8-log-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-light-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-arrow-40-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-clamps-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,6 +205,9 @@ ..\Resources\icons8-resize-horizontal-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-save-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-border-all-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,14 +229,11 @@ ..\Resources\icons8-robot-hand-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-arrow-40-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-control-panel-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-smart-lock-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-grab-tool-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-input-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,52 +250,58 @@ ..\Resources\icons8-arrow-pointing-left-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-red-circle-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-hand-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-grab-tool-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-pin-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-edit-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-light-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-running-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-smart-lock-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-exercise-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-backward-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-object-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-tornado-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-stepper-motor-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-save-close-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-edit-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-zoom-in-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-green-circle-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-red-circle-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-selection-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-object-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-printer-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-pin-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-save-close-40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-checked-radio-button-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-printer-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Handler/Project/Properties/Settings.Designer.cs b/Handler/Project/Properties/Settings.Designer.cs index ca79c3d..0bf3003 100644 --- a/Handler/Project/Properties/Settings.Designer.cs +++ b/Handler/Project/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Project.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Handler/Project/Properties/Settings.settings b/Handler/Project/Properties/Settings.settings index 232934c..9b5f5f2 100644 --- a/Handler/Project/Properties/Settings.settings +++ b/Handler/Project/Properties/Settings.settings @@ -49,7 +49,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <ConnectionString>Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> @@ -57,7 +57,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <ConnectionString>Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> @@ -65,7 +65,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <ConnectionString>Data Source=V1SPCSQL,51122;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password="2!x2$yY8R;}$";Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> diff --git a/Handler/Project/Pub.cs b/Handler/Project/Pub.cs index 959f118..4f52b9e 100644 --- a/Handler/Project/Pub.cs +++ b/Handler/Project/Pub.cs @@ -55,9 +55,6 @@ namespace Project public static int uploadcount = 0; public static DateTime BuzzerTime; public static DateTime MGZRunTime; - - public static CounterSetting counter; - //public static Flag flag; public static MessageWindow popup; @@ -88,20 +85,16 @@ namespace Project public static Manager.ModelManager mdm; public static System_MotParameter system_mot; - public static SystemSetting system; - public static UserSetting uSetting; - //public static CommonSetting setting; - public static arUtil.Log logVision; - public static arUtil.Log log; - public static arUtil.Log logILStop; - public static arUtil.Log logDbg; - public static arUtil.Log logFlag; - public static arUtil.Log logILock; - public static arUtil.Log logWS; - public static arUtil.Log logKeyence; - // public static arUtil.Log logCV; - public static arUtil.Log logbarcode; + public static Log logVision; + public static Log log; + public static Log logILStop; + public static Log logDbg; + public static Log logFlag; + public static Log logILock; + public static Log logWS; + public static Log logKeyence; + public static Log logbarcode; public static DataSet1.UsersDataTable userList; public static DataSet1.MailRecipientDataTable mailList; @@ -184,10 +177,10 @@ namespace Project PUB.log.AddAT("모션모델선택완료 : " + PUB.Result.mModel.Title); //사용한 모델이름을 저장함 - if (PUB.uSetting.LastModelM != PUB.Result.mModel.Title) + if (SETTING.User.LastModelM != PUB.Result.mModel.Title) { - PUB.uSetting.LastModelM = PUB.Result.mModel.Title; - PUB.uSetting.Save(); + SETTING.User.LastModelM = PUB.Result.mModel.Title; + SETTING.User.Save(); } return true; } @@ -251,10 +244,10 @@ namespace Project PUB.log.AddAT("작업모델선택완료 : " + mv.Title); //선택한 모델을 저장함 - if (PUB.uSetting.LastModelV != mv.Title) + if (SETTING.User.LastModelV != mv.Title) { - PUB.uSetting.LastModelV = mv.Title; - PUB.uSetting.Save(); + SETTING.User.LastModelV = mv.Title; + SETTING.User.Save(); } PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false); @@ -423,7 +416,7 @@ namespace Project { //해당 차수로 저장된 파일이 잇는지 체크한다. - var savepath = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "JobData", seqdate.Substring(0, 6), seqdate + "-" + seqno + ".txt"); + var savepath = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "JobData", seqdate.Substring(0, 6), seqdate + "-" + seqno + ".txt"); var fi = new System.IO.FileInfo(savepath); if (fi.Directory.Exists == false) fi.Directory.Create(); //폴더가 없다면 생성 @@ -472,6 +465,91 @@ namespace Project } } + //public static void MakeSelectState(ref List wheres, List<(bool option, bool condition, string colname)> items) + //{ + // foreach (var item in items) + // { + // var opt = item.option; + // var condition = item.condition; + // var column = item.colname; + // if (opt) + // { + // if (condition) wheres.Add($"{column}"); + // } + // } + //} + //public static bool MakeWhereState(ref List wheres, List<(bool option,bool condition, string colname, string value)> items) + //{ + // foreach (var item in items) + // { + // var opt = item.option; + // var condition = item.condition; + // var value = item.value; + // var column = item.colname; + // if(opt) + // { + // if (condition) wheres.Add($"{column}='{value}'"); + // return false; + // } + // } + // return true; + //} + + public static bool GetSIDInfo_And_SetData(List fields, + ref Class.VisionData vdata, + string SQL, string SQLC) + { + + bool NewBarcodeUpdated = false; + PUB.log.Add($"DATABAES : SID INFORMATIION QUERY"); + PUB.log.Add($"Data={SQL}"); + if (SQLC.isEmpty() == false) PUB.log.Add($"Count={SQLC}"); + var CS = Properties.Settings.Default.CS; + var CN = new System.Data.SqlClient.SqlConnection(CS); + var CMD = new System.Data.SqlClient.SqlCommand(SQLC, CN); + SqlDataReader DAR = null; + if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); + + var cnt = 1; + + //수량체크쿼리가 있다면 그것을 사용한다 + if (SQLC.isEmpty() == false) + cnt = CMD.ExecuteScalar().ToString().toInt(); + + //데이터가 1건만 존재할때 사용한다 + if (cnt == 1) + { + CMD.CommandText = SQL; + DAR = CMD.ExecuteReader(); + while (DAR.Read()) + { + //loop select columns + for (int i = 0; i < fields.Count; i++) + { + var colName = fields[i]; + var v = DAR[colName]; + if (v != null) + { + var vStr = v.ToString().RemoveNoneASCII().Trim(); + if (vStr.isEmpty()) continue; + + if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true; + } + } + } + } + + + if (DAR != null) DAR.Close(); + if (CMD != null) CMD.Dispose(); + if (CN != null) + { + if (CN.State == System.Data.ConnectionState.Open) CN.Close(); + CN.Dispose(); + } + return NewBarcodeUpdated; + } + /// /// 지정된 VisionData에 해당 값을 기록 합니다 /// ColName 이 하드코딩되어있으니 필드명이 변경되면 값을 변경해야 함 @@ -510,7 +588,7 @@ namespace Project vdata.VNAME_Trust = true; return true; } - else if (colName == "venderlot" || colName == "vendorlot" || colName == "vendor_lot") + else if (colName == "venderlot" || colName == "vendorlot" || colName == "vendor_lot") { PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.VLOT}=>{vStr}"); vdata.VLOT = vStr; @@ -900,11 +978,28 @@ namespace Project foreach (var item in groupsbuf) { var itembuf = item.Split('='); - Groups.Add(new Class.RegexGroupMatch + if (itembuf.Length > 1) { - GroupNo = int.Parse(itembuf[1].Trim()), - TargetPos = itembuf[0].Trim(), - }); + int grpno = 0; + string targetpos = ""; + + if (int.TryParse(itembuf[1].Trim(), out grpno) == false) + { + if (int.TryParse(itembuf[0].Trim(), out grpno) == false) + { + PUB.log.AddE($"RegEX Grp Data Error = {item}"); + } + else targetpos = itembuf[1].Trim(); + } + else targetpos = itembuf[0].Trim(); + + Groups.Add(new Class.RegexGroupMatch + { + GroupNo = grpno,//int.Parse(itembuf[1].Trim()), + TargetPos = targetpos,//itembuf[0].Trim(), + }); + } + else PUB.log.AddE($"RegEX Grp Data Error = {item}"); } //add pattern data @@ -1032,38 +1127,23 @@ namespace Project public static void initCore() { - //system parameter - system = new SystemSetting(); - system.Load(); - system_mot = new System_MotParameter(UTIL.MakePath("System_mot.xml")); system_mot.Load(); - + //setting SETTING.Load(); VAR.Init(LenI32: 128, LenBool: 192); - //flag = new VarDataBool(128); - - //user setting - uSetting = new UserSetting(); - uSetting.Load(); - - //counter setting - counter = new CounterSetting(); - counter.Load(); - - //log - log = new arUtil.Log(); - logDbg = new arUtil.Log(); logDbg.FileNameFormat = "{yyyyMMdd}_DEBUG"; - logFlag = new arUtil.Log(); logFlag.FileNameFormat = "{yyyyMMdd}_FG"; - logILock = new arUtil.Log(); logILock.FileNameFormat = "{yyyyMMdd}_IL"; - logbarcode = new arUtil.Log(); logbarcode.FileNameFormat = "{yyyyMMdd}_BC"; - logWS = new arUtil.Log(); logWS.FileNameFormat = "{yyyyMMdd}_WS"; - logKeyence = new arUtil.Log(); logKeyence.FileNameFormat = "{yyyyMMdd}_KEYENCE"; - logILStop = new arUtil.Log(); logILStop.FileNameFormat = "{yyyyMMdd}_ILOCK"; - logVision = new arUtil.Log(); logVision.FileNameFormat = "{yyyyMMdd}_VISION"; + log = new Log(); + logDbg = new Log(); logDbg.FileNameFormat = "{yyyyMMdd}_DEBUG"; + logFlag = new Log(); logFlag.FileNameFormat = "{yyyyMMdd}_FG"; + logILock = new Log(); logILock.FileNameFormat = "{yyyyMMdd}_IL"; + logbarcode = new Log(); logbarcode.FileNameFormat = "{yyyyMMdd}_BC"; + logWS = new Log(); logWS.FileNameFormat = "{yyyyMMdd}_WS"; + logKeyence = new Log(); logKeyence.FileNameFormat = "{yyyyMMdd}_KEYENCE"; + logILStop = new Log(); logILStop.FileNameFormat = "{yyyyMMdd}_ILOCK"; + logVision = new Log(); logVision.FileNameFormat = "{yyyyMMdd}_VISION"; //popupmessage popup = new MessageWindow(); @@ -1127,7 +1207,7 @@ namespace Project dbmSidHistory = new Manager.DatabaseManagerSIDHistory(); dbmCount = new Manager.DatabaseManagerCount(); - dbmCount.dataPath = AR.SETTING.Data.Path_Data; //200113 + dbmCount.dataPath = AR.SETTING.Data.GetDataPath(); //200113 dio = new arDev.AjinEXTEK.DIO(arDev.AjinEXTEK.ELibraryType.AXT); mot = new arDev.AjinEXTEK.MOT(arDev.AjinEXTEK.ELibraryType.AXT); @@ -1554,7 +1634,7 @@ namespace Project freespace = 100.0; - savePath1 = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "Images"); + savePath1 = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "Images"); if (savePath1 != "" && System.IO.Directory.Exists(savePath1)) { path1Exist = true; @@ -1612,7 +1692,7 @@ namespace Project public static void CheckFreeSpace() { //용량확인 - var DriveName = AR.SETTING.Data.Path_Data.Substring(0, 1); + var DriveName = AR.SETTING.Data.GetDataPath().Substring(0, 1); PUB.FreeSpace = UTIL.GetFreeSpace(DriveName); } diff --git a/Handler/Project/Resources/arrow_refresh_small.png b/Handler/Project/Resources/arrow_refresh_small.png new file mode 100644 index 0000000..d3087df Binary files /dev/null and b/Handler/Project/Resources/arrow_refresh_small.png differ diff --git a/Handler/Project/Resources/copy.gif b/Handler/Project/Resources/copy.gif new file mode 100644 index 0000000..ff81b3b Binary files /dev/null and b/Handler/Project/Resources/copy.gif differ diff --git a/Handler/Project/RunCode/Display/_Interval_1min.cs b/Handler/Project/RunCode/Display/_Interval_1min.cs index 8034cbf..cb8437a 100644 --- a/Handler/Project/RunCode/Display/_Interval_1min.cs +++ b/Handler/Project/RunCode/Display/_Interval_1min.cs @@ -29,13 +29,13 @@ namespace Project // try // { // DateTime SetTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " " + COMM.SETTING.Data.datetime_Reset_1 + ":00"); - // DateTime LastClearTime = Pub.counter.; + // DateTime LastClearTime = SETTING.Counter.; // //현재 시간이 클리어대상 시간보다 크고, 마지막으로 클리어한 시간이 지정시간보다 작아야함 // if (DateTime.Now > SetTime && LastClearTime < SetTime) // { // Pub.log.AddI("Count Reset #1"); - // Pub.counter.ClearDay(); + // SETTING.Counter.ClearDay(); // } // } // catch { } @@ -46,13 +46,13 @@ namespace Project // try // { // DateTime SetTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " " + COMM.SETTING.Data.datetime_Reset_2 + ":00"); - // DateTime LastClearTime = Pub.counter.CountReset; + // DateTime LastClearTime = SETTING.Counter.CountReset; // //현재 시간이 클리어대상 시간보다 크고, 마지막으로 클리어한 시간이 지정시간보다 작아야함 // if (DateTime.Now > SetTime && LastClearTime < SetTime) // { // Pub.log.AddI("Count Reset #2"); - // Pub.counter.ClearDay(); + // SETTING.Counter.ClearDay(); // } // } // catch { } diff --git a/Handler/Project/RunCode/Display/_Interval_500ms.cs b/Handler/Project/RunCode/Display/_Interval_500ms.cs index c188921..f18a3b4 100644 --- a/Handler/Project/RunCode/Display/_Interval_500ms.cs +++ b/Handler/Project/RunCode/Display/_Interval_500ms.cs @@ -30,8 +30,8 @@ namespace Project lbCntLeft.Text = $"{VAR.I32[eVarInt32.LPickOfCount]}"; lbCntRight.Text = $"{VAR.I32[eVarInt32.RPickOfCount]}"; lbCntPicker.Text = $"{VAR.I32[eVarInt32.PickOfCount]}"; - //lbCntPrnL.Text = $"{PUB.counter.CountPrintL}"; - //lbCnrPrnR.Text = $"{PUB.counter.CountPrintR}"; + //lbCntPrnL.Text = $"{SETTING.Counter.CountPrintL}"; + //lbCnrPrnR.Text = $"{SETTING.Counter.CountPrintR}"; if (AR.SETTING.Data.Enable_SpeedLimit) grpProgress.Text = $"작업 수량(속도제한:{AR.SETTING.Data.LimitSpeed})"; diff --git a/Handler/Project/RunCode/Display/_TMDisplay.cs b/Handler/Project/RunCode/Display/_TMDisplay.cs index 3067d49..358cba8 100644 --- a/Handler/Project/RunCode/Display/_TMDisplay.cs +++ b/Handler/Project/RunCode/Display/_TMDisplay.cs @@ -237,25 +237,25 @@ namespace Project hmi1.arVar_Port[0].LimitUpper = DIO.GetIOInput(eDIName.PORTL_LIM_UP); hmi1.arVar_Port[0].DetectUp = DIO.GetIOInput(eDIName.PORTL_DET_UP); hmi1.arVar_Port[0].SaftyErr = !DIO.isSaftyDoorF(0, false); - hmi1.arVar_Port[0].reelCount = PUB.counter.CountP0; + hmi1.arVar_Port[0].reelCount = SETTING.Counter.CountP0; hmi1.arVar_Port[0].CartSize = (int)DIO.getCartSize(0); hmi1.arVar_Port[1].LimitLower = DIO.GetIOInput(eDIName.PORTC_LIM_DN); //front-right hmi1.arVar_Port[1].LimitUpper = DIO.GetIOInput(eDIName.PORTC_LIM_UP); hmi1.arVar_Port[1].DetectUp = DIO.GetIOInput(eDIName.PORTC_DET_UP); hmi1.arVar_Port[1].SaftyErr = !DIO.isSaftyDoorF(1, false); - hmi1.arVar_Port[1].reelCount = PUB.counter.CountP1; + hmi1.arVar_Port[1].reelCount = SETTING.Counter.CountP1; hmi1.arVar_Port[1].CartSize = (int)DIO.getCartSize(1); hmi1.arVar_Port[2].LimitLower = DIO.GetIOInput(eDIName.PORTR_LIM_DN); //front-left hmi1.arVar_Port[2].LimitUpper = DIO.GetIOInput(eDIName.PORTR_LIM_UP); hmi1.arVar_Port[2].DetectUp = DIO.GetIOInput(eDIName.PORTR_DET_UP); hmi1.arVar_Port[2].SaftyErr = !DIO.isSaftyDoorF(2, false); - hmi1.arVar_Port[2].reelCount = PUB.counter.CountP2; + hmi1.arVar_Port[2].reelCount = SETTING.Counter.CountP2; hmi1.arVar_Port[2].CartSize = (int)DIO.getCartSize(2); - hmi1.arCountPrint0 = PUB.counter.CountPrintL; - hmi1.arCountPrint1 = PUB.counter.CountPrintR; + hmi1.arCountPrint0 = SETTING.Counter.CountPrintL; + hmi1.arCountPrint1 = SETTING.Counter.CountPrintR; if (VAR.BOOL[eVarBool.Use_Conveyor]) { @@ -263,9 +263,9 @@ namespace Project hmi1.arVar_Port[2].reelCount = VAR.I32[eVarInt32.RIGT_ITEM_COUNT]; } - hmi1.arCountV1 = PUB.counter.CountV1; - hmi1.arCountV0 = PUB.counter.CountV0; - hmi1.arCountV2 = PUB.counter.CountV2; + hmi1.arCountV1 = SETTING.Counter.CountV1; + hmi1.arCountV0 = SETTING.Counter.CountV0; + hmi1.arCountV2 = SETTING.Counter.CountV2; //피커 백큠감지 상태(Front) hmi1.arVar_Picker[0].VacOutput[0] = DIO.GetIOOutput(eDOName.PICK_VAC1); diff --git a/Handler/Project/RunCode/Display/_UpdateStatusMessage.cs b/Handler/Project/RunCode/Display/_UpdateStatusMessage.cs index 33312ce..e557c92 100644 --- a/Handler/Project/RunCode/Display/_UpdateStatusMessage.cs +++ b/Handler/Project/RunCode/Display/_UpdateStatusMessage.cs @@ -64,7 +64,7 @@ namespace Project var limport = new List(); if (PUB.mot.HasLimitError == true) { - for (short i = 0; i < PUB.system.MotaxisCount; i++) + for (short i = 0; i < SETTING.System.MotaxisCount; i++) { if (PUB.mot.IsUse(i) == false) continue; if (PUB.mot.IsLimitN(i)) diff --git a/Handler/Project/RunCode/RunSequence/0_RUN_STARTCHK_SW.cs b/Handler/Project/RunCode/RunSequence/0_RUN_STARTCHK_SW.cs index cf50125..12f9e37 100644 --- a/Handler/Project/RunCode/RunSequence/0_RUN_STARTCHK_SW.cs +++ b/Handler/Project/RunCode/RunSequence/0_RUN_STARTCHK_SW.cs @@ -23,7 +23,7 @@ namespace Project "디스크 공간(3%)이 부족하여 작업을 진행할 수 없습니다\n" + "저장경로 : {0}\n" + "데이터를 삭제하거나 설정의 삭제주기를 확인하세요"; - msg = string.Format(msg, AR.SETTING.Data.Path_Data); + msg = string.Format(msg, AR.SETTING.Data.GetDataPath()); PUB.popup.setMessage(msg); DIO.SetBuzzer(true); PUB.sm.SetNewStep(eSMStep.IDLE); diff --git a/Handler/Project/RunCode/RunSequence/2_RUN_ROOT_SEQUENCE.cs b/Handler/Project/RunCode/RunSequence/2_RUN_ROOT_SEQUENCE.cs index 14126cf..34ba38d 100644 --- a/Handler/Project/RunCode/RunSequence/2_RUN_ROOT_SEQUENCE.cs +++ b/Handler/Project/RunCode/RunSequence/2_RUN_ROOT_SEQUENCE.cs @@ -298,6 +298,31 @@ namespace Project } return false; } + else if (Complete == EResultKeyence.MultiSID) + { + //이미 사용자 확인창 + if (PUB.flag.get(eVarBool.FG_WAIT_INFOSELECT)) + { + //아무것도 하지 않는다 + //사용자가 정보를 설정하는 중 + } + else + { + bool SHowUserFormINF = true; + + //사용자 확인창을 표시한다 + if (SHowUserFormINF) //다중SID정보 선택건 + { + this.Invoke(new Action(() => + { + PUB.log.Add("사용자 선택창(INF)을 호출 합니다"); + var f = new Dialog.fSelectSIDInformation(); + f.Show(); + })); + } + } + return false; + } else if (Complete == EResultKeyence.TimeOut) { //이미 사용자 확인창 @@ -309,23 +334,23 @@ namespace Project else { //반복시도횟수가 설정되지 않았거나 최대를 초과하면 사용자 확인창을 띄운다 - bool ShowUserForm = false; + bool ShowUserFormBCD = false; if (AR.SETTING.Data.RetryPickOnMaxCount == 0) { PUB.log.Add($"픽온 재시작 횟수가 없어 사용자 확인창을 띄웁니다"); - ShowUserForm = true; + ShowUserFormBCD = true; } else if (AR.VAR.I32[AR.eVarInt32.PickOnRetry] >= AR.SETTING.Data.RetryPickOnMaxCount) { PUB.log.Add($"픽온 재시도 횟수가 초과됨 (최대:{AR.SETTING.Data.RetryPickOnMaxCount})"); - ShowUserForm = true; + ShowUserFormBCD = true; } else { if (VAR.BOOL[eVarBool.Need_UserConfirm_Data]) { PUB.log.Add($"사용자확인창을 띄워야함"); - ShowUserForm = true; + ShowUserFormBCD = true; } else { @@ -333,18 +358,16 @@ namespace Project if (PUB.Result.ItemDataC.VisionData.SID.isEmpty() || PUB.Result.ItemDataC.VisionData.SID_Trust == false) { PUB.log.Add($"픽온을 재시도 합니다 ({AR.VAR.I32[AR.eVarInt32.PickOnRetry]}/{AR.SETTING.Data.RetryPickOnMaxCount})"); - ShowUserForm = false; + ShowUserFormBCD = false; } else { PUB.log.Add($"SID값이 있으니 재시도하지 않고 사용자확인창을 띄웁니다"); - ShowUserForm = true; + ShowUserFormBCD = true; } } } - - //사용자 확인창을 표시한다 - if (ShowUserForm) + if (ShowUserFormBCD) { this.Invoke(new Action(() => { diff --git a/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs b/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs index 836d240..6a2e405 100644 --- a/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs +++ b/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Security.Cryptography; +using System.ServiceModel.Configuration; using System.Text; using AR; using Project.Class; @@ -16,6 +17,7 @@ namespace Project Wait = 0, Complete, TimeOut, + MultiSID, } public EResultKeyence KEYENCE_READ(eWorkPort target, eSMStep cmdIndex) { @@ -67,6 +69,8 @@ namespace Project } VAR.BOOL[eVarBool.Need_UserConfirm_Data] = false; + VAR.STR[eVarString.MULTISID_FIELDS] = string.Empty; + VAR.STR[eVarString.MULTISID_QUERY] = string.Empty; VAR.TIME.Update(eVarTime.KEYENCEWAIT); PUB.sm.seq.Update(cmdIndex); return EResultKeyence.Wait; @@ -92,35 +96,41 @@ namespace Project //동작중이아니라면 처리하지 않음 if (PUB.sm.getNewStep != eSMStep.RUN) return EResultKeyence.Wait; - //var k1 = UpLoadBarcodeConfig(PUB.keyenceF); - //바이패스라면 무조건ok한다. var systembypassmode = SETTING.Data.SystemBypass; if (systembypassmode && PUB.flag.get(eVarBool.FG_RDY_PORT_PC)) { - vdata.VisionData.SetRID("BP" + DateTime.Now.ToString("yyyyMMddHHmmss"), "bp"); - vdata.VisionData.SID = ("100000000"); - vdata.VisionData.VNAME = "BYPASS"; - vdata.VisionData.MFGDATE = DateTime.Now.ToString("yyyy-MM-dd"); - vdata.VisionData.VLOT = "BYPASS"; - vdata.VisionData.CUSTCODE = "0000"; - vdata.VisionData.CUSTNAME = "BYPASS"; - vdata.VisionData.QTY = "10000"; - vdata.VisionData.ConfirmUser = true; - vdata.VisionData.PrintPositionData = "1"; - vdata.VisionData.PrintPositionCheck = true; + vdata.SetRID("BP" + DateTime.Now.ToString("yyyyMMddHHmmss"), "bp"); + vdata.SID = ("100000000"); + vdata.VNAME = "BYPASS"; + vdata.MFGDATE = DateTime.Now.ToString("yyyy-MM-dd"); + vdata.VLOT = "BYPASS"; + vdata.CUSTCODE = "0000"; + vdata.CUSTNAME = "BYPASS"; + vdata.QTY = "10000"; + vdata.ConfirmUser = true; + vdata.PrintPositionData = "1"; + vdata.PrintPositionCheck = true; + vdata.MFGDATE_Trust = true; + vdata.PARTNO_Trust = true; + vdata.QTY_Trust = true; + vdata.RID_Trust = true; + vdata.SID_Trust = true; + vdata.VLOT_Trust = true; + vdata.VNAME_Trust = true; return EResultKeyence.Complete; } - //로더정보를 사용자가 처리중이면 동작 안함 - if (PUB.flag.get(eVarBool.FG_WAIT_LOADERINFO)) return EResultKeyence.TimeOut; + if (VAR.BOOL[eVarBool.FG_WAIT_LOADERINFO]) return EResultKeyence.TimeOut; + + //다중SID환경에서 데이터를 선택하고 있다. + if (VAR.BOOL[eVarBool.FG_WAIT_INFOSELECT]) return EResultKeyence.Wait; //데이터 처리 시간을 넘어서면 사용자 확인 창을 띄운다 220621 var ts = VAR.TIME.RUN((int)eVarTime.KEYENCEWAIT); - if (PUB.flag.get(eVarBool.FG_RDY_PORT_PC) && ts.TotalMilliseconds > AR.SETTING.Data.Timeout_VisionProcessL) + if (VAR.BOOL[eVarBool.FG_RDY_PORT_PC] && ts.TotalMilliseconds > AR.SETTING.Data.Timeout_VisionProcessL) { - //화면업데이트를 종료한다 if (PUB.keyenceF != null) PUB.keyenceF.Trigger(false); if (PUB.keyenceR != null) PUB.keyenceR.Trigger(false); @@ -142,18 +152,10 @@ namespace Project itemC.VisionData.SetImage( new Emgu.CV.Mat(tempfiF.FullName, Emgu.CV.CvEnum.ImreadModes.Grayscale), new Emgu.CV.Mat(tempfiR.FullName, Emgu.CV.CvEnum.ImreadModes.Grayscale)); - //using (var tempimg = new Emgu.CV.Image(tempfi.FullName)) - //{ - // itemC.VisionData.SetImage(tempimg); - //} } else if (CurImageF) { itemC.VisionData.SetImage(new Emgu.CV.Mat(tempfiF.FullName, Emgu.CV.CvEnum.ImreadModes.Grayscale)); - //using (var tempimg = new Emgu.CV.Image(tempfi.FullName)) - //{ - // itemC.VisionData.SetImage(tempimg); - //} } PUB.keyenceF.Trigger(true); PUB.keyenceR.Trigger(true); @@ -184,7 +186,6 @@ namespace Project } } - //기본 벤더이름 if (OPT_BYPASS == false && PUB.Result.vModel.Def_Vname.isEmpty() == false) { @@ -206,10 +207,87 @@ namespace Project PUB.log.Add($"Defaul MFGDATE Set to {PUB.Result.vModel.Def_MFG}"); } } - + //옵션설정에 따른 외부데이터 가져오기 작업 bool NewBarcodeUpdated = false; - + + + //[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음) + //[WMS] 에서 중복검색되면 팝업을 해야하므로 이것을 먼저 처리한다. + if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true) + { + Boolean Apply = true; + + //select columns + List fields = new List(); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUST_CODE"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PART_NO"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VENDOR_NM"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("BATCH_NO"); //220921 + + //where coluns + List wheres = new List(); + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUST_CODE='{vdata.CUSTCODE}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) + { + if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PART_NO='{vdata.PARTNO}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_SID]) + { + if (VAR.BOOL[eVarBool.Opt_SIDConvert]) //if sid convert logic + { + if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); + else Apply = false; + } + else + { + if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); + else Apply = false; + } + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 + { + if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VENDER_LOT = '{vdata.VLOT}'"); + else Apply = false; + } + + //if query data . no error + if (Apply && fields.Count > 0 && wheres.Count > 0) + { + var mcname = VAR.BOOL[eVarBool.Use_Conveyor] ? PUB.MCCode : SETTING.Data.McName; + + var TableName = "VW_GET_MAX_QTY_VENDOR_LOT"; + var whereState = " where " + string.Join(" and ", wheres); + var selectFields = string.Join(",", fields); + + var SQL = $"select top 1 {selectFields} from {TableName} WITH(NOLOCK) {whereState}"; + var SQLC = $"select count(*) from {TableName} WITH(NOLOCK) {whereState}"; + + //정보가 여러개 존재하면 선택화면으로 처리해야한다 + var cntvalue = (DBHelper.ExecuteScalar(SQLC)?.ToString() ?? "0").toInt(); + if (cntvalue > 1) + { + VAR.STR[eVarString.MULTISID_QUERY] = $"select {selectFields} from {TableName} WITH(NOLOCK) {whereState}"; + VAR.STR[eVarString.MULTISID_FIELDS] = selectFields; + return EResultKeyence.MultiSID; + } + + if (PUB.Result.ItemDataC.VisionData.LastQueryStringWMS.Equals(SQL) == false) //같은 쿼리는 처리하지 않는다 + { + if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC)) + NewBarcodeUpdated = true; + + PUB.Result.ItemDataC.VisionData.LastQueryStringWMS = SQL; + } + + } + } //SID정보테이블에서 정보 추출 if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true) @@ -230,20 +308,19 @@ namespace Project //where coluns List wheres = new List(); //wheres.Add($"MC='{COMM.SETTING.Data.McName}"); - if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) { if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE}'"); else Apply = false; } - if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) { if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PartNo='{vdata.PARTNO}'"); else Apply = false; } - if (VAR.BOOL[eVarBool.Opt_SID_Where_SID]) + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_SID]) { - //if sid convert logic - if (VAR.BOOL[eVarBool.Opt_SIDConvert]) + if (VAR.BOOL[eVarBool.Opt_SIDConvert]) //if sid convert logic { if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); @@ -255,16 +332,18 @@ namespace Project else Apply = false; } } - if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 { if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); else Apply = false; } - if (VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 { - wheres.Add($"attach='{AR.SETTING.Data.McName}'"); + if (AR.SETTING.Data.McName.isEmpty() == false) + wheres.Add($"attach='{AR.SETTING.Data.McName}'"); + else Apply = false; } //if query data . no error @@ -285,54 +364,151 @@ namespace Project if (PUB.Result.ItemDataC.VisionData.LastQueryStringSID.Equals(SQL) == false) { + if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC) == true) + NewBarcodeUpdated = true; - PUB.log.Add($"DATABAES : SID INFORMATIION QUERY"); - PUB.log.Add(SQL); - var CS = Properties.Settings.Default.CS; - var CN = new System.Data.SqlClient.SqlConnection(CS); - var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); - if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); - - //데이터가 중복으로 존재하는지 확인한다. 231006 - CMD.CommandText = SQLC; - var cnt = int.Parse(CMD.ExecuteScalar().ToString()); - if (cnt == 1) - { - CMD.CommandText = SQL; - var DAR = CMD.ExecuteReader(); - while (DAR.Read()) - { - //loop select columns - for (int i = 0; i < fields.Count; i++) - { - var colName = fields[i]; - var v = DAR[colName]; - if (v != null) - { - var vStr = v.ToString().RemoveNoneASCII().Trim(); - if (vStr.isEmpty()) continue; - - if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true; - } - } - } - DAR.Close(); - } - CMD.Dispose(); - if (CN.State == System.Data.ConnectionState.Open) CN.Close(); - CN.Dispose(); PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL; } } } + //시드변환정보에서 정보 추출 + if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeDirty == true) + { + Boolean Apply = true; + + //select columns + List fields = new List(); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CustCode"); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PartNo"); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("PrintPosition"); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VenderName"); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_Batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("batch"); //220921 + if (VAR.BOOL[eVarBool.Opt_Conv_Apply_QtyMax] && (vdata.SID_Trust == false || vdata.QTYMAX.isEmpty())) fields.Add("qtymax"); //220921 - //WMS정보테이블에서 정보 추출 + //where coluns + List wheres = new List(); + //wheres.Add($"MC='{COMM.SETTING.Data.McName}"); + if (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_PartNo]) + { + if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PartNo='{vdata.PARTNO}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_SID]) + { + if (VAR.BOOL[eVarBool.Opt_SIDConvert]) //if sid convert logic + { + if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) + wheres.Add($"SIDTo='{vdata.SID}'"); + else Apply = false; + } + else + { + if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SIDTo='{vdata.SID}'"); + else Apply = false; + } + } + if (VAR.BOOL[eVarBool.Opt_Conv_Where_VLOT]) //221013 + { + if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) + wheres.Add($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); + else Apply = false; + } - //SID변환정보에서 정보 추출 - //기존 작업내역에서 정보 추출 + //if query data . no error + if (Apply && fields.Count > 0 && wheres.Count > 0) + { + + var mcname = SETTING.Data.McName; + if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode; + + var SQL = "select top 1 " + string.Join(",", fields) + + " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" + + " where " + string.Join(" and ", wheres) + + " order by wdate desc"; + + var SQLC = "select count(*)" + + " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" + + " where " + string.Join(" and ", wheres); + + if (PUB.Result.ItemDataC.VisionData.LastQueryStringCNV.Equals(SQL) == false) + { + if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC) == true) + NewBarcodeUpdated = true; + + PUB.Result.ItemDataC.VisionData.LastQueryStringCNV = SQL; + } + } + } + + //기존 작업에서 데이터를 찾아서 쓴다 + if (VAR.BOOL[eVarBool.Opt_ApplyJobInfo] && vdata.BarcodeDirty == true) + { + Boolean Apply = true; + + //select columns + List fields = new List(); + + if (VAR.BOOL[eVarBool.Opt_Job_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUSTCODE"); + if (VAR.BOOL[eVarBool.Opt_Job_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PARTNO"); + if (VAR.BOOL[eVarBool.Opt_Job_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("POS"); + if (VAR.BOOL[eVarBool.Opt_Job_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VNAME"); + if (VAR.BOOL[eVarBool.Opt_Job_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); + + //where coluns + List wheres = new List(); + if (VAR.BOOL[eVarBool.Opt_Job_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUSTCODE='{vdata.CUSTCODE}'"); + else Apply = false; + } + if (VAR.BOOL[eVarBool.Opt_Job_Where_PartNo]) + { + if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PARTNO='{vdata.PARTNO}'"); + else Apply = false; + } + if (VAR.BOOL[eVarBool.Opt_Job_Where_SID]) + { + if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); + else Apply = false; + } + if (VAR.BOOL[eVarBool.Opt_Job_Where_VLOT]) + { + if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VenderLot='{vdata.VLOT}'"); + else Apply = false; + } + + //if query data . no error + if (Apply && fields.Count > 0 && wheres.Count > 0) + { + PUB.log.Add($"DATABAES : RESULT QUERY"); + + var SQL = "select top 1 " + string.Join(",", fields) + + " from K4EE_Component_Reel_Result WITH(NOLOCK) " + + $" where mc = '{AR.SETTING.Data.McName}'" + + $" and prnattach = 1 and stime >= '{DateTime.Now.AddHours(-3).ToString("yyyy-MM-dd HH:mm:ss")}'" + + $" and " + string.Join(" and ", wheres) + + $" order by wdate desc"; + + if (PUB.Result.ItemDataC.VisionData.LastQueryStringJOB.Equals(SQL) == false) + { + if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, "")) + NewBarcodeUpdated = true; + + PUB.Result.ItemDataC.VisionData.LastQueryStringJOB = SQL; + } + } + } + + //해당 바코드작업이 완료되었는지 확인한다. 신규 바코드값이 업데이트되면 한번더 동작하도록 한다 if (itemC.VisionData.BarcodeDirty == true && NewBarcodeUpdated == false) { itemC.VisionData.BarcodeDirty = false; @@ -377,7 +553,6 @@ namespace Project } } - //데이터확정 및 완료처리 if (itemC.VisionData.Confirm) { @@ -421,7 +596,6 @@ namespace Project return EResultKeyence.Wait; } - //#################################################### //### //#################################################### diff --git a/Handler/Project/RunCode/RunSequence/6.PRINT.cs b/Handler/Project/RunCode/RunSequence/6.PRINT.cs index e0d2b16..047cae8 100644 --- a/Handler/Project/RunCode/RunSequence/6.PRINT.cs +++ b/Handler/Project/RunCode/RunSequence/6.PRINT.cs @@ -95,13 +95,13 @@ namespace Project string zpl, qrdata; zpl = Printer.makeZPL_210908(new Class.Reel { - sid = item.VisionData.SID, - lot = item.VisionData.VLOT, - manu = item.VisionData.VNAME, + SID = item.VisionData.SID, + venderLot = item.VisionData.VLOT, + venderName = item.VisionData.VNAME, qty = item.VisionData.QTY.isEmpty() ? -1 : int.Parse(item.VisionData.QTY), id = item.VisionData.RID, mfg = item.VisionData.MFGDATE, - partnum = item.VisionData.PARTNO, + PartNo = item.VisionData.PARTNO, }, AR.SETTING.Data.DrawOutbox, out qrdata); item.VisionData.ZPL = zpl; item.VisionData.PrintQRData = qrdata; @@ -119,7 +119,7 @@ namespace Project } else { - PUB.counter.CountPrintL += 1; + SETTING.Counter.CountPrintL += 1; item.PrintTime = DateTime.Now; } } @@ -136,7 +136,7 @@ namespace Project } else { - PUB.counter.CountPrintR += 1; + SETTING.Counter.CountPrintR += 1; item.PrintTime = DateTime.Now; } } diff --git a/Handler/Project/RunCode/StateMachine/_SM_DIO.cs b/Handler/Project/RunCode/StateMachine/_SM_DIO.cs index 3510e4a..ce3eb14 100644 --- a/Handler/Project/RunCode/StateMachine/_SM_DIO.cs +++ b/Handler/Project/RunCode/StateMachine/_SM_DIO.cs @@ -83,36 +83,36 @@ namespace Project void IncCount(int seq, int port, int value = 1) { - if (PUB.counter.DateStr != DateTime.Now.ToShortDateString()) + if (SETTING.Counter.DateStr != DateTime.Now.ToShortDateString()) { - if (port == 0) PUB.counter.CountDP1 = value; - if (port == 1) PUB.counter.CountDP2 = value; - if (port == 2) PUB.counter.CountDP3 = value; - if (port == 3) PUB.counter.CountDP4 = value; - PUB.counter.DateStr = DateTime.Now.ToShortDateString(); + if (port == 0) SETTING.Counter.CountDP1 = value; + if (port == 1) SETTING.Counter.CountDP2 = value; + if (port == 2) SETTING.Counter.CountDP3 = value; + if (port == 3) SETTING.Counter.CountDP4 = value; + SETTING.Counter.DateStr = DateTime.Now.ToShortDateString(); } else { - if (port == 0) PUB.counter.CountDP1 += value; - if (port == 1) PUB.counter.CountDP2 += value; - if (port == 2) PUB.counter.CountDP3 += value; - if (port == 3) PUB.counter.CountDP4 += value; + if (port == 0) SETTING.Counter.CountDP1 += value; + if (port == 1) SETTING.Counter.CountDP2 += value; + if (port == 2) SETTING.Counter.CountDP3 += value; + if (port == 3) SETTING.Counter.CountDP4 += value; } //각 포트별 수량은 차수별 작업이므로 차수가 변경되면 리셋됨 //리셋되는 코드 필요함 - if (port == 0) PUB.counter.CountP0 += value; - if (port == 1) PUB.counter.CountP1 += value; - if (port == 2) PUB.counter.CountP2 += value; - if (port == 3) PUB.counter.CountPrintR += value; + if (port == 0) SETTING.Counter.CountP0 += value; + if (port == 1) SETTING.Counter.CountP1 += value; + if (port == 2) SETTING.Counter.CountP2 += value; + if (port == 3) SETTING.Counter.CountPrintR += value; else { PUB.log.AddAT(string.Format("[{0}] 미지정 포트이므로 수량 증가 불가", seq)); } //Pub.log.AddI("수량정보가 저장 되었습니다"); - PUB.counter.Save(); + SETTING.Counter.Save(); } diff --git a/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs b/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs index b4e52a6..e4fdf93 100644 --- a/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs +++ b/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs @@ -158,7 +158,6 @@ namespace Project if (vdata.Confirm) return; var vm = PUB.Result.vModel; - //바코드목록에서 정규식값으로 각 필드값을 기록한다. lock (vdata.barcodelist) { @@ -182,431 +181,6 @@ namespace Project bcdObj.RegExConfirm = true; } } - - //바코드가 변경된 경우이다, 자동채우기 기능이 있다면 사용한다 - bool NewBarcodeUpdated = false; - - //SID정보테이블에서 정보 추출 - if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true) - { - Boolean Apply = true; - - //select columns - List fields = new List(); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CustCode"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PartNo"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("PrintPosition"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VenderName"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("batch"); //220921 - if (VAR.BOOL[eVarBool.Opt_SID_Apply_qty] && (vdata.SID_Trust == false || vdata.QTYMAX.isEmpty())) fields.Add("qtymax"); //220921 - fields.Add("attach"); //231026 - - //where coluns - List wheres = new List(); - //wheres.Add($"MC='{COMM.SETTING.Data.McName}"); - if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) - { - if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PartNo='{vdata.PARTNO}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_SID]) - { - //if sid convert logic - if (VAR.BOOL[eVarBool.Opt_SIDConvert]) - { - if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) - wheres.Add($"SID='{vdata.SID}'"); - else Apply = false; - } - else - { - if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); - else Apply = false; - } - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 - { - if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) - wheres.Add($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); - else Apply = false; - } - - if (VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 - { - wheres.Add($"attach='{AR.SETTING.Data.McName}'"); - } - - //if query data . no error - if (Apply && fields.Count > 0 && wheres.Count > 0) - { - - var mcname = SETTING.Data.McName; - if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode; - - var SQL = "select top 1 " + string.Join(",", fields) + - " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" + - " where mc='" + mcname + "' and " + string.Join(" and ", wheres) + - " order by wdate desc"; - - var SQLC = "select count(*)" + - " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" + - " where mc='" + mcname + "' and " + string.Join(" and ", wheres); - - if (PUB.Result.ItemDataC.VisionData.LastQueryStringSID.Equals(SQL) == false) - { - - PUB.log.Add($"DATABAES : SID INFORMATIION QUERY"); - PUB.log.Add(SQL); - var CS = Properties.Settings.Default.CS; - var CN = new System.Data.SqlClient.SqlConnection(CS); - var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); - if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); - - //데이터가 중복으로 존재하는지 확인한다. 231006 - CMD.CommandText = SQLC; - var cnt = int.Parse(CMD.ExecuteScalar().ToString()); - if (cnt == 1) - { - CMD.CommandText = SQL; - var DAR = CMD.ExecuteReader(); - while (DAR.Read()) - { - //loop select columns - for (int i = 0; i < fields.Count; i++) - { - var colName = fields[i]; - var v = DAR[colName]; - if (v != null) - { - var vStr = v.ToString().RemoveNoneASCII().Trim(); - if (vStr.isEmpty()) continue; - - if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true; - } - } - } - DAR.Close(); - } - CMD.Dispose(); - if (CN.State == System.Data.ConnectionState.Open) CN.Close(); - CN.Dispose(); - PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL; - } - } - } - - //[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음) - if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true) - { - Boolean Apply = true; - - //select columns - List fields = new List(); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUST_CODE"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PART_NO"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VENDOR_NM"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); - if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("BATCH_NO"); //220921 - - //where coluns - List wheres = new List(); - if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUST_CODE='{vdata.CUSTCODE}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) - { - if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PART_NO='{vdata.PARTNO}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_SID]) - { - if (VAR.BOOL[eVarBool.Opt_SIDConvert]) //if sid convert logic - { - if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); - else Apply = false; - } - else - { - if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); - else Apply = false; - } - } - if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 - { - if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VENDER_LOT = '{vdata.VLOT}'"); - else Apply = false; - } - - //if query data . no error - if (Apply && fields.Count > 0 && wheres.Count > 0) - { - var mcname = VAR.BOOL[eVarBool.Use_Conveyor] ? PUB.MCCode : SETTING.Data.McName; - - var TableName = "VW_GET_MAX_QTY_VENDOR_LOT"; - var whereState = " where " + string.Join(" and ", wheres); - var selectFields = string.Join(",", fields); - - var SQL = $"select top 1 {selectFields} from {TableName} WITH(NOLOCK) {whereState}"; - var SQLC = $"select count(*) from {TableName} WITH(NOLOCK) {whereState}"; - - if (PUB.Result.ItemDataC.VisionData.LastQueryStringWMS.Equals(SQL) == false) //같은 쿼리는 처리하지 않는다 - { - PUB.log.Add($"DATABAES : WMS INFORMATIION QUERY"); - PUB.log.Add(SQL); - var CS = Properties.Settings.Default.CS; - var CN = new System.Data.SqlClient.SqlConnection(CS); - var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); - if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); - - //데이터가 중복으로 존재하는지 확인한다. 231006 - CMD.CommandText = SQLC; - var cnt = int.Parse(CMD.ExecuteScalar().ToString()); - if (cnt == 1) - { - CMD.CommandText = SQL; - var DAR = CMD.ExecuteReader(); - while (DAR.Read()) - { - //loop select columns - for (int i = 0; i < fields.Count; i++) - { - var colName = fields[i]; - var v = DAR[colName]; - if (v != null) - { - var vStr = v.ToString().RemoveNoneASCII().Trim(); - if (vStr.isEmpty()) continue; - - if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true; - } - } - } - DAR.Close(); - } - CMD.Dispose(); - if (CN.State == System.Data.ConnectionState.Open) CN.Close(); - CN.Dispose(); - PUB.Result.ItemDataC.VisionData.LastQueryStringWMS = SQL; - } - } - } - - //시드변환정보에서 정보 추출 - if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeDirty == true) - { - Boolean Apply = true; - - //select columns - List fields = new List(); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CustCode"); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PartNo"); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("PrintPosition"); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VenderName"); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_Batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("batch"); //220921 - if (VAR.BOOL[eVarBool.Opt_Conv_Apply_QtyMax] && (vdata.SID_Trust == false || vdata.QTYMAX.isEmpty())) fields.Add("qtymax"); //220921 - - - //where coluns - List wheres = new List(); - //wheres.Add($"MC='{COMM.SETTING.Data.McName}"); - if (VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_Conv_Where_PartNo]) - { - if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PartNo='{vdata.PARTNO}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_Conv_Where_SID]) - { - //if sid convert logic - if (VAR.BOOL[eVarBool.Opt_SIDConvert]) - { - if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) - wheres.Add($"SIDTo='{vdata.SID}'"); - else Apply = false; - } - else - { - if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SIDTo='{vdata.SID}'"); - else Apply = false; - } - } - if (VAR.BOOL[eVarBool.Opt_Conv_Where_VLOT]) //221013 - { - if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) - wheres.Add($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); - else Apply = false; - } - - //if (VAR.BOOL[eVarBool.Opt_Conv_Where_MC]) //231006 - //{ - // wheres.Add($"attach='{AR.SETTING.Data.McName}'"); - //} - - //if query data . no error - if (Apply && fields.Count > 0 && wheres.Count > 0) - { - - var mcname = SETTING.Data.McName; - if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode; - - var SQL = "select top 1 " + string.Join(",", fields) + - " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" + - " where " + string.Join(" and ", wheres) + - " order by wdate desc"; - - var SQLC = "select count(*)" + - " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" + - " where " + string.Join(" and ", wheres); - - if (PUB.Result.ItemDataC.VisionData.LastQueryStringCNV.Equals(SQL) == false) - { - - PUB.log.Add($"DATABAES : SID(CONV) INFORMATIION QUERY"); - PUB.log.Add(SQL); - var CS = Properties.Settings.Default.CS; - var CN = new System.Data.SqlClient.SqlConnection(CS); - var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); - if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); - - //데이터가 중복으로 존재하는지 확인한다. 231006 - CMD.CommandText = SQLC; - var cnt = int.Parse(CMD.ExecuteScalar().ToString()); - if (cnt == 1) - { - CMD.CommandText = SQL; - var DAR = CMD.ExecuteReader(); - while (DAR.Read()) - { - //loop select columns - for (int i = 0; i < fields.Count; i++) - { - var colName = fields[i]; - var v = DAR[colName]; - if (v != null) - { - var vStr = v.ToString().RemoveNoneASCII().Trim(); - if (vStr.isEmpty()) continue; - - if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true; - } - } - } - DAR.Close(); - } - CMD.Dispose(); - if (CN.State == System.Data.ConnectionState.Open) CN.Close(); - CN.Dispose(); - PUB.Result.ItemDataC.VisionData.LastQueryStringCNV = SQL; - } - } - } - - //기존 작업에서 데이터를 찾아서 쓴다 - if (VAR.BOOL[eVarBool.Opt_ApplyJobInfo] && vdata.BarcodeDirty == true) - { - Boolean Apply = true; - - //select columns - List fields = new List(); - if (VAR.BOOL[eVarBool.Opt_Job_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUSTCODE"); - if (VAR.BOOL[eVarBool.Opt_Job_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PARTNO"); - if (VAR.BOOL[eVarBool.Opt_Job_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("POS"); - if (VAR.BOOL[eVarBool.Opt_Job_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VNAME"); - if (VAR.BOOL[eVarBool.Opt_Job_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); - - //where coluns - List wheres = new List(); - if (VAR.BOOL[eVarBool.Opt_Job_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUSTCODE='{vdata.CUSTCODE}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_Job_Where_PartNo]) - { - if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PARTNO='{vdata.PARTNO}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_Job_Where_SID]) - { - if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'"); - else Apply = false; - } - if (VAR.BOOL[eVarBool.Opt_Job_Where_VLOT]) - { - if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VenderLot='{vdata.VLOT}'"); - else Apply = false; - } - - //if query data . no error - if (Apply && fields.Count > 0 && wheres.Count > 0) - { - PUB.log.Add($"DATABAES : RESULT QUERY"); - - var SQL = "select top 1 " + string.Join(",", fields) + - " from K4EE_Component_Reel_Result WITH(NOLOCK) " + - $" where mc = '{AR.SETTING.Data.McName}'" + - $" and prnattach = 1 and stime >= '{DateTime.Now.AddHours(-3).ToString("yyyy-MM-dd HH:mm:ss")}'" + - $" and " + string.Join(" and ", wheres) + - $" order by wdate desc"; - - // var SQLC = "select count(*) " + - //" from Component_Reel_Result WITH(NOLOCK) " + - //$" where mc = '{AR.SETTING.Data.McName}'" + - //$" and prnattach = 1 and stime >= '{DateTime.Now.AddHours(-3).ToString("yyyy-MM-dd HH:mm:ss")}'" + - //$" and " + string.Join(" and ", wheres) + - //$" order by wdate desc"; - - var CS = Properties.Settings.Default.CS; - var CN = new System.Data.SqlClient.SqlConnection(CS); - var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN); - if (CN.State == System.Data.ConnectionState.Closed) CN.Open(); - - var DAR = CMD.ExecuteReader(); - while (DAR.Read()) - { - //loop select columns - for (int i = 0; i < fields.Count; i++) - { - var colName = fields[i]; - var v = DAR[colName]; - if (v != null) - { - var vStr = v.ToString().RemoveNoneASCII().Trim(); - if (vStr.isEmpty()) continue; - - if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) - NewBarcodeUpdated = true; - } - } - } - DAR.Close(); - - CMD.Dispose(); - if (CN.State == System.Data.ConnectionState.Open) CN.Close(); - CN.Dispose(); - } - } - - //바코드 처리 여부 변경 - if (vdata.BarcodeDirty == true && NewBarcodeUpdated == false) - { - vdata.BarcodeDirty = false; - } - - } } diff --git a/Handler/Project/RunCode/Step/_STEP_IDLE.cs b/Handler/Project/RunCode/Step/_STEP_IDLE.cs index 2ec677e..6d6a899 100644 --- a/Handler/Project/RunCode/Step/_STEP_IDLE.cs +++ b/Handler/Project/RunCode/Step/_STEP_IDLE.cs @@ -67,7 +67,7 @@ namespace Project if (ts.TotalSeconds > 1) { //파일을 찾아서 소거한다. - var delpath = System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "Images"); + var delpath = System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "Images"); if (delpath != "") DeleteFile(delpath); lastDeleteTime = DateTime.Now; diff --git a/Handler/Project/RunCode/Step/_STEP_INIT.cs b/Handler/Project/RunCode/Step/_STEP_INIT.cs index b9040c3..9cd55c8 100644 --- a/Handler/Project/RunCode/Step/_STEP_INIT.cs +++ b/Handler/Project/RunCode/Step/_STEP_INIT.cs @@ -94,8 +94,8 @@ namespace Project PUB.sm.RaiseStateProgress(++progress, "이전모델 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5); // - if (PUB.uSetting.LastModelV != "") PUB.SelectModelV(PUB.uSetting.LastModelV, false); - var motionmodel = PUB.uSetting.LastModelM; + if (SETTING.User.LastModelV != "") PUB.SelectModelV(SETTING.User.LastModelV, false); + var motionmodel = SETTING.User.LastModelM; if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion; if (motionmodel.ToUpper().StartsWith("CONV")) PUB.flag.set(eVarBool.Use_Conveyor, true, "load"); else PUB.flag.set(eVarBool.Use_Conveyor, false, "load"); @@ -161,7 +161,7 @@ namespace Project } else { - for (short i = 0; i < PUB.system.MotaxisCount; i++) + for (short i = 0; i < SETTING.System.MotaxisCount; i++) { //설정파일이 있다면 불러온다 var file = System.IO.Path.Combine(UTIL.CurrentPath, "Model", "axis" + i.ToString() + ".motaxt"); diff --git a/Handler/Project/RunCode/Step/_STEP_RUN.cs b/Handler/Project/RunCode/Step/_STEP_RUN.cs index eacacf6..7994418 100644 --- a/Handler/Project/RunCode/Step/_STEP_RUN.cs +++ b/Handler/Project/RunCode/Step/_STEP_RUN.cs @@ -45,11 +45,11 @@ namespace Project //loader1.arVar_Port.ToList().ForEach(t => t.AlignReset()); //daycount 초기화 - if (PUB.counter.DateStr != DateTime.Now.ToString("yyyy-MM-dd")) + if (SETTING.Counter.DateStr != DateTime.Now.ToString("yyyy-MM-dd")) { - PUB.counter.ClearDay(); - PUB.counter.DateStr = DateTime.Now.ToString("yyyy-MM-dd"); - PUB.counter.Save(); + SETTING.Counter.ClearDay(); + SETTING.Counter.DateStr = DateTime.Now.ToString("yyyy-MM-dd"); + SETTING.Counter.Save(); } @@ -117,7 +117,7 @@ namespace Project //PUB.Result.JobStartTime = DateTime.Now; //200728 //신규실행이므로 작업차수별 수량을 초기화해준다 - PUB.counter.ClearP(); //200711 + SETTING.Counter.ClearP(); //200711 PUB.flag.set(eVarBool.FG_JOB_END, false, "SM_RUN"); diff --git a/Handler/Project/RunCode/_Motion.cs b/Handler/Project/RunCode/_Motion.cs index ee03f3b..ecda9c3 100644 --- a/Handler/Project/RunCode/_Motion.cs +++ b/Handler/Project/RunCode/_Motion.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Text; +using AR; namespace Project { @@ -23,7 +24,7 @@ namespace Project void mot_StatusChanged(object sender, arDev.MOT.StatusChangeEventArags e) { - if (e.Axis >= PUB.system.MotaxisCount) return; + if (e.Axis >= SETTING.System.MotaxisCount) return; if (e.Status == arDev.MOT.MOTION_STATUS.SERVOALARM) hmi1.arMOT_Alm[e.Axis] = e.Value; else if (e.Status == arDev.MOT.MOTION_STATUS.LIMITN) hmi1.arMOT_LimDn[e.Axis] = e.Value; else if (e.Status == arDev.MOT.MOTION_STATUS.LIMITP) hmi1.arMOT_LimUp[e.Axis] = e.Value; diff --git a/Handler/Project/STDLabelAttach(ATV).csproj b/Handler/Project/STDLabelAttach(ATV).csproj index 79e1a54..abfdfa6 100644 --- a/Handler/Project/STDLabelAttach(ATV).csproj +++ b/Handler/Project/STDLabelAttach(ATV).csproj @@ -69,7 +69,7 @@ true - ..\..\..\..\..\Amkor\STDLabelAttach%28ATV%29\ + ..\..\..\..\..\amkor\STDLabelAttach%28ATV%29\ DEBUG;TRACE full x64 @@ -106,19 +106,12 @@ False - ..\DLL\arCommUtil.dll + ..\..\..\..\(5650#) K5, Mold Thickness Measurement Machine for DSmBGA\Source\Handler\DLL\arCommUtil.dll False ..\DLL\arControl.Net4.dll - - ..\DLL\ArLog.Net4.dll - - - False - ..\DLL\ArSetting.Net4.dll - ..\packages\chilkat-x64.9.5.0.77\lib\net47\ChilkatDotNet47.dll @@ -294,6 +287,12 @@ fHistory.cs + + Form + + + fSelectSIDInformation.cs + Form @@ -533,6 +532,12 @@ Form + + Form + + + fSetting.cs + Form @@ -614,13 +619,6 @@ Form - - - Form - - - fSetting.cs - @@ -646,9 +644,7 @@ fSystem_MotParameter.cs - - Form @@ -752,6 +748,9 @@ fHistory.cs + + fSelectSIDInformation.cs + fLoaderInfo.cs @@ -842,6 +841,9 @@ fSIDQty.cs + + fSetting.cs + fSystem_Setting.cs @@ -849,9 +851,6 @@ fMain.cs Designer - - fSetting.cs - ResXFileCodeGenerator Resources.Designer.cs @@ -939,6 +938,8 @@ PreserveNewest + + diff --git a/Handler/Project/Setting/fSetting.cs b/Handler/Project/Setting/fSetting.cs index 08aff92..18987d7 100644 --- a/Handler/Project/Setting/fSetting.cs +++ b/Handler/Project/Setting/fSetting.cs @@ -206,7 +206,7 @@ namespace Project UTIL.MsgE("언어파일이 없습니다\n" + langfile); return; } - var ini = new arUtil.INIHelper(); + var ini = new AR.INIHelper(); ini.Load(langfile); this.dataSet1.language.Clear(); foreach (var item in ini.GetItemList("lang").OrderBy(t => t.Key)) @@ -222,7 +222,7 @@ namespace Project private void toolStripButton2_Click(object sender, EventArgs e) { var file = Lang.FileName; - var ini = new arUtil.INIHelper(file); + var ini = new AR.INIHelper(file); this.bsLang.EndEdit(); this.dataSet1.language.AcceptChanges(); foreach (DataSet1.languageRow dr in dataSet1.language.Rows) diff --git a/Handler/Project/Setting/fSystem_Setting.cs b/Handler/Project/Setting/fSystem_Setting.cs index 588bb88..72cfbf0 100644 --- a/Handler/Project/Setting/fSystem_Setting.cs +++ b/Handler/Project/Setting/fSystem_Setting.cs @@ -6,6 +6,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; +using AR; namespace Project.Dialog { @@ -25,13 +26,13 @@ namespace Project.Dialog private void button1_Click(object sender, EventArgs e) { this.Invalidate(); - PUB.system.Save(); + SETTING.System.Save(); DialogResult = System.Windows.Forms.DialogResult.OK; } private void SystemParameter_Load(object sender, EventArgs e) { - this.propertyGrid1.SelectedObject = PUB.system; + this.propertyGrid1.SelectedObject = SETTING.System; this.propertyGrid1.Invalidate(); } diff --git a/Handler/Project/Util/Util_DO.cs b/Handler/Project/Util/Util_DO.cs index 28f5b6c..161cf67 100644 --- a/Handler/Project/Util/Util_DO.cs +++ b/Handler/Project/Util/Util_DO.cs @@ -349,47 +349,47 @@ namespace Project } else if (pin == eDIName.BUT_EMGF) { - if (PUB.system.ReverseSIG_Emgergency) curValue = !curValue; + if (SETTING.System.ReverseSIG_Emgergency) curValue = !curValue; } else if (pin == eDIName.PICKER_SAFE) { - if (PUB.system.ReverseSIG_PickerSafe) curValue = !curValue; + if (SETTING.System.ReverseSIG_PickerSafe) curValue = !curValue; } else if (pin == eDIName.BUT_AIRF) { - if (PUB.system.ReverseSIG_ButtonAir) curValue = !curValue; + if (SETTING.System.ReverseSIG_ButtonAir) curValue = !curValue; } else if (pin == eDIName.DOORF1 || pin == eDIName.DOORF2 || pin == eDIName.DOORF3) { - if (PUB.system.ReverseSIG_DoorF) curValue = !curValue; + if (SETTING.System.ReverseSIG_DoorF) curValue = !curValue; } else if (pin == eDIName.DOORR1 || pin == eDIName.DOORR2 || pin == eDIName.DOORR3) { - if (PUB.system.ReverseSIG_DoorR) curValue = !curValue; + if (SETTING.System.ReverseSIG_DoorR) curValue = !curValue; } else if (pin == eDIName.AIR_DETECT) { - if (PUB.system.ReverseSIG_AirCheck) curValue = !curValue; + if (SETTING.System.ReverseSIG_AirCheck) curValue = !curValue; } else if (pin == eDIName.PORTL_LIM_UP || pin == eDIName.PORTC_LIM_UP || pin == eDIName.PORTR_LIM_UP) { - if (PUB.system.ReverseSIG_PortLimitUp) curValue = !curValue; + if (SETTING.System.ReverseSIG_PortLimitUp) curValue = !curValue; } else if (pin == eDIName.PORTL_LIM_DN || pin == eDIName.PORTC_LIM_DN || pin == eDIName.PORTR_LIM_DN) { - if (PUB.system.ReverseSIG_PortLimitDn) curValue = !curValue; + if (SETTING.System.ReverseSIG_PortLimitDn) curValue = !curValue; } else if (pin == eDIName.PORTL_DET_UP) { - if (PUB.system.ReverseSIG_PortDetect0Up) curValue = !curValue; + if (SETTING.System.ReverseSIG_PortDetect0Up) curValue = !curValue; } else if (pin == eDIName.PORTC_DET_UP) { - if (PUB.system.ReverseSIG_PortDetect1Up) curValue = !curValue; + if (SETTING.System.ReverseSIG_PortDetect1Up) curValue = !curValue; } else if (pin == eDIName.PORTR_DET_UP) { - if (PUB.system.ReverseSIG_PortDetect2Up) curValue = !curValue; + if (SETTING.System.ReverseSIG_PortDetect2Up) curValue = !curValue; } //else if(pin == eDIName.L_CYLUP) //임시코드 //{ @@ -401,11 +401,11 @@ namespace Project //} //else if (pin == eDIName.L_EXT_READY) //{ - // if (PUB.system.ReverseSIG_ExtConvReady) curValue = !curValue; + // if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue; //} //else if (pin == eDIName.R_EXT_READY) //{ - // if (PUB.system.ReverseSIG_ExtConvReady) curValue = !curValue; + // if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue; //} else if (pin == eDIName.L_CONV1 || pin == eDIName.L_CONV4 || pin == eDIName.L_CONV3) curValue = !curValue; diff --git a/Handler/Project/Util/Util_Mot.cs b/Handler/Project/Util/Util_Mot.cs index bab7b77..55a4c16 100644 --- a/Handler/Project/Util/Util_Mot.cs +++ b/Handler/Project/Util/Util_Mot.cs @@ -31,8 +31,8 @@ namespace Project for (short i = 0; i < PUB.mot.DeviceCount; i++) { if (PUB.mot.IsUse(i) == false) continue; //미사용축은 제외한다. - //if (PUB.system.UseAxis(i) == false) continue; - //if (PUB.system.UseOriginSignal(i) == false) continue; + //if (SETTING.System.UseAxis(i) == false) continue; + //if (SETTING.System.UseOriginSignal(i) == false) continue; if (PUB.mot.IsLimit(i)) return true; } return false; @@ -58,7 +58,7 @@ namespace Project //accr 범위가 지정되잇다며 ㄴ그것을 사용한다 if (inpaccr == 0f) - inpaccr = 0.1f;// PUB.system.INPAccurary(axis); + inpaccr = 0.1f;// SETTING.System.INPAccurary(axis); //X축을 그립위치까지 이동함 @@ -377,7 +377,7 @@ namespace Project retval.Speed = Math.Min(retval.Speed, AR.SETTING.Data.LimitSpeed); ////시스템설정의 속도 체크 220524 - //var maxspeed = PUB.system.GetMaxSpeed; + //var maxspeed = SETTING.System.GetMaxSpeed; //var motidx = (int)axis; //if (motidx >= 0 && motidx < maxspeed.Length && maxspeed[motidx] > 0) //{ @@ -385,7 +385,7 @@ namespace Project //} ////시스템설정의 가속도체크 - //var maxAcc = PUB.system.GetMaxAcc; + //var maxAcc = SETTING.System.GetMaxAcc; //if (motidx >= 0 && motidx < maxAcc.Length && maxAcc[motidx] > 0) //{ // retval.Acc = Math.Min(retval.Acc, maxAcc[motidx]); diff --git a/Handler/Project/dsWMS.Designer.cs b/Handler/Project/dsWMS.Designer.cs index 228253f..9cbc392 100644 --- a/Handler/Project/dsWMS.Designer.cs +++ b/Handler/Project/dsWMS.Designer.cs @@ -24,8 +24,6 @@ namespace Project { [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")] public partial class dsWMS : global::System.Data.DataSet { - private VW_GET_MAX_QTY_CUSTDataTable tableVW_GET_MAX_QTY_CUST; - private VW_GET_MAX_QTY_VENDOR_LOTDataTable tableVW_GET_MAX_QTY_VENDOR_LOT; private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; @@ -56,9 +54,6 @@ namespace Project { if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); - if ((ds.Tables["VW_GET_MAX_QTY_CUST"] != null)) { - base.Tables.Add(new VW_GET_MAX_QTY_CUSTDataTable(ds.Tables["VW_GET_MAX_QTY_CUST"])); - } if ((ds.Tables["VW_GET_MAX_QTY_VENDOR_LOT"] != null)) { base.Tables.Add(new VW_GET_MAX_QTY_VENDOR_LOTDataTable(ds.Tables["VW_GET_MAX_QTY_VENDOR_LOT"])); } @@ -80,16 +75,6 @@ namespace Project { this.Relations.CollectionChanged += schemaChangedHandler; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - [global::System.ComponentModel.Browsable(false)] - [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public VW_GET_MAX_QTY_CUSTDataTable VW_GET_MAX_QTY_CUST { - get { - return this.tableVW_GET_MAX_QTY_CUST; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -167,9 +152,6 @@ namespace Project { this.Reset(); global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXml(reader); - if ((ds.Tables["VW_GET_MAX_QTY_CUST"] != null)) { - base.Tables.Add(new VW_GET_MAX_QTY_CUSTDataTable(ds.Tables["VW_GET_MAX_QTY_CUST"])); - } if ((ds.Tables["VW_GET_MAX_QTY_VENDOR_LOT"] != null)) { base.Tables.Add(new VW_GET_MAX_QTY_VENDOR_LOTDataTable(ds.Tables["VW_GET_MAX_QTY_VENDOR_LOT"])); } @@ -206,12 +188,6 @@ namespace Project { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars(bool initTable) { - this.tableVW_GET_MAX_QTY_CUST = ((VW_GET_MAX_QTY_CUSTDataTable)(base.Tables["VW_GET_MAX_QTY_CUST"])); - if ((initTable == true)) { - if ((this.tableVW_GET_MAX_QTY_CUST != null)) { - this.tableVW_GET_MAX_QTY_CUST.InitVars(); - } - } this.tableVW_GET_MAX_QTY_VENDOR_LOT = ((VW_GET_MAX_QTY_VENDOR_LOTDataTable)(base.Tables["VW_GET_MAX_QTY_VENDOR_LOT"])); if ((initTable == true)) { if ((this.tableVW_GET_MAX_QTY_VENDOR_LOT != null)) { @@ -228,18 +204,10 @@ namespace Project { this.Namespace = "http://tempuri.org/dsWMS.xsd"; this.EnforceConstraints = true; this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; - this.tableVW_GET_MAX_QTY_CUST = new VW_GET_MAX_QTY_CUSTDataTable(); - base.Tables.Add(this.tableVW_GET_MAX_QTY_CUST); this.tableVW_GET_MAX_QTY_VENDOR_LOT = new VW_GET_MAX_QTY_VENDOR_LOTDataTable(); base.Tables.Add(this.tableVW_GET_MAX_QTY_VENDOR_LOT); } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private bool ShouldSerializeVW_GET_MAX_QTY_CUST() { - return false; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializeVW_GET_MAX_QTY_VENDOR_LOT() { @@ -301,322 +269,9 @@ namespace Project { return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public delegate void VW_GET_MAX_QTY_CUSTRowChangeEventHandler(object sender, VW_GET_MAX_QTY_CUSTRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void VW_GET_MAX_QTY_VENDOR_LOTRowChangeEventHandler(object sender, VW_GET_MAX_QTY_VENDOR_LOTRowChangeEvent e); - /// - ///Represents the strongly named DataTable class. - /// - [global::System.Serializable()] - [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class VW_GET_MAX_QTY_CUSTDataTable : global::System.Data.TypedTableBase { - - private global::System.Data.DataColumn columnPART_NO; - - private global::System.Data.DataColumn columnVENDOR_NM; - - private global::System.Data.DataColumn columnBATCH_NO; - - private global::System.Data.DataColumn columnQTY; - - private global::System.Data.DataColumn columnCUST_CODE; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTDataTable() { - this.TableName = "VW_GET_MAX_QTY_CUST"; - this.BeginInit(); - this.InitClass(); - this.EndInit(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal VW_GET_MAX_QTY_CUSTDataTable(global::System.Data.DataTable table) { - this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { - this.CaseSensitive = table.CaseSensitive; - } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { - this.Locale = table.Locale; - } - if ((table.Namespace != table.DataSet.Namespace)) { - this.Namespace = table.Namespace; - } - this.Prefix = table.Prefix; - this.MinimumCapacity = table.MinimumCapacity; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected VW_GET_MAX_QTY_CUSTDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { - this.InitVars(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn PART_NOColumn { - get { - return this.columnPART_NO; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn VENDOR_NMColumn { - get { - return this.columnVENDOR_NM; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn BATCH_NOColumn { - get { - return this.columnBATCH_NO; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn QTYColumn { - get { - return this.columnQTY; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn CUST_CODEColumn { - get { - return this.columnCUST_CODE; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - [global::System.ComponentModel.Browsable(false)] - public int Count { - get { - return this.Rows.Count; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTRow this[int index] { - get { - return ((VW_GET_MAX_QTY_CUSTRow)(this.Rows[index])); - } - } - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public event VW_GET_MAX_QTY_CUSTRowChangeEventHandler VW_GET_MAX_QTY_CUSTRowChanging; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public event VW_GET_MAX_QTY_CUSTRowChangeEventHandler VW_GET_MAX_QTY_CUSTRowChanged; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public event VW_GET_MAX_QTY_CUSTRowChangeEventHandler VW_GET_MAX_QTY_CUSTRowDeleting; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public event VW_GET_MAX_QTY_CUSTRowChangeEventHandler VW_GET_MAX_QTY_CUSTRowDeleted; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void AddVW_GET_MAX_QTY_CUSTRow(VW_GET_MAX_QTY_CUSTRow row) { - this.Rows.Add(row); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTRow AddVW_GET_MAX_QTY_CUSTRow(string PART_NO, string VENDOR_NM, string BATCH_NO, decimal QTY, string CUST_CODE) { - VW_GET_MAX_QTY_CUSTRow rowVW_GET_MAX_QTY_CUSTRow = ((VW_GET_MAX_QTY_CUSTRow)(this.NewRow())); - object[] columnValuesArray = new object[] { - PART_NO, - VENDOR_NM, - BATCH_NO, - QTY, - CUST_CODE}; - rowVW_GET_MAX_QTY_CUSTRow.ItemArray = columnValuesArray; - this.Rows.Add(rowVW_GET_MAX_QTY_CUSTRow); - return rowVW_GET_MAX_QTY_CUSTRow; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataTable Clone() { - VW_GET_MAX_QTY_CUSTDataTable cln = ((VW_GET_MAX_QTY_CUSTDataTable)(base.Clone())); - cln.InitVars(); - return cln; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { - return new VW_GET_MAX_QTY_CUSTDataTable(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { - this.columnPART_NO = base.Columns["PART_NO"]; - this.columnVENDOR_NM = base.Columns["VENDOR_NM"]; - this.columnBATCH_NO = base.Columns["BATCH_NO"]; - this.columnQTY = base.Columns["QTY"]; - this.columnCUST_CODE = base.Columns["CUST_CODE"]; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { - this.columnPART_NO = new global::System.Data.DataColumn("PART_NO", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnPART_NO); - this.columnVENDOR_NM = new global::System.Data.DataColumn("VENDOR_NM", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnVENDOR_NM); - this.columnBATCH_NO = new global::System.Data.DataColumn("BATCH_NO", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnBATCH_NO); - this.columnQTY = new global::System.Data.DataColumn("QTY", typeof(decimal), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnQTY); - this.columnCUST_CODE = new global::System.Data.DataColumn("CUST_CODE", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCUST_CODE); - this.columnPART_NO.AllowDBNull = false; - this.columnPART_NO.MaxLength = 50; - this.columnVENDOR_NM.AllowDBNull = false; - this.columnVENDOR_NM.MaxLength = 200; - this.columnBATCH_NO.MaxLength = 50; - this.columnCUST_CODE.AllowDBNull = false; - this.columnCUST_CODE.MaxLength = 50; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTRow NewVW_GET_MAX_QTY_CUSTRow() { - return ((VW_GET_MAX_QTY_CUSTRow)(this.NewRow())); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { - return new VW_GET_MAX_QTY_CUSTRow(builder); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Type GetRowType() { - return typeof(VW_GET_MAX_QTY_CUSTRow); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowChanged(e); - if ((this.VW_GET_MAX_QTY_CUSTRowChanged != null)) { - this.VW_GET_MAX_QTY_CUSTRowChanged(this, new VW_GET_MAX_QTY_CUSTRowChangeEvent(((VW_GET_MAX_QTY_CUSTRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowChanging(e); - if ((this.VW_GET_MAX_QTY_CUSTRowChanging != null)) { - this.VW_GET_MAX_QTY_CUSTRowChanging(this, new VW_GET_MAX_QTY_CUSTRowChangeEvent(((VW_GET_MAX_QTY_CUSTRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowDeleted(e); - if ((this.VW_GET_MAX_QTY_CUSTRowDeleted != null)) { - this.VW_GET_MAX_QTY_CUSTRowDeleted(this, new VW_GET_MAX_QTY_CUSTRowChangeEvent(((VW_GET_MAX_QTY_CUSTRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowDeleting(e); - if ((this.VW_GET_MAX_QTY_CUSTRowDeleting != null)) { - this.VW_GET_MAX_QTY_CUSTRowDeleting(this, new VW_GET_MAX_QTY_CUSTRowChangeEvent(((VW_GET_MAX_QTY_CUSTRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void RemoveVW_GET_MAX_QTY_CUSTRow(VW_GET_MAX_QTY_CUSTRow row) { - this.Rows.Remove(row); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { - global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); - global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); - dsWMS ds = new dsWMS(); - global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); - any1.Namespace = "http://www.w3.org/2001/XMLSchema"; - any1.MinOccurs = new decimal(0); - any1.MaxOccurs = decimal.MaxValue; - any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; - sequence.Items.Add(any1); - global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); - any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; - any2.MinOccurs = new decimal(1); - any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; - sequence.Items.Add(any2); - global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); - attribute1.Name = "namespace"; - attribute1.FixedValue = ds.Namespace; - type.Attributes.Add(attribute1); - global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); - attribute2.Name = "tableTypeName"; - attribute2.FixedValue = "VW_GET_MAX_QTY_CUSTDataTable"; - type.Attributes.Add(attribute2); - type.Particle = sequence; - global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { - global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); - global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { - global::System.Xml.Schema.XmlSchema schema = null; - dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { - schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); - s2.SetLength(0); - schema.Write(s2); - if ((s1.Length == s2.Length)) { - s1.Position = 0; - s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { - ; - } - if ((s1.Position == s1.Length)) { - return type; - } - } - } - } - finally { - if ((s1 != null)) { - s1.Close(); - } - if ((s2 != null)) { - s2.Close(); - } - } - } - xs.Add(dsSchema); - return type; - } - } - /// ///Represents the strongly named DataTable class. /// @@ -624,6 +279,8 @@ namespace Project { [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] public partial class VW_GET_MAX_QTY_VENDOR_LOTDataTable : global::System.Data.TypedTableBase { + private global::System.Data.DataColumn columnidx; + private global::System.Data.DataColumn columnPART_NO; private global::System.Data.DataColumn columnVENDOR_NM; @@ -636,6 +293,10 @@ namespace Project { private global::System.Data.DataColumn columnVENDOR_LOT; + private global::System.Data.DataColumn columnSID; + + private global::System.Data.DataColumn columnMFG_DATE; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public VW_GET_MAX_QTY_VENDOR_LOTDataTable() { @@ -669,6 +330,14 @@ namespace Project { this.InitVars(); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn idxColumn { + get { + return this.columnidx; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn PART_NOColumn { @@ -717,6 +386,22 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn SIDColumn { + get { + return this.columnSID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn MFG_DATEColumn { + get { + return this.columnMFG_DATE; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -754,20 +439,30 @@ namespace Project { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_VENDOR_LOTRow AddVW_GET_MAX_QTY_VENDOR_LOTRow(string PART_NO, string VENDOR_NM, string BATCH_NO, decimal QTY, string CUST_CODE, string VENDOR_LOT) { + public VW_GET_MAX_QTY_VENDOR_LOTRow AddVW_GET_MAX_QTY_VENDOR_LOTRow(int idx, string PART_NO, string VENDOR_NM, string BATCH_NO, decimal QTY, string CUST_CODE, string VENDOR_LOT, string SID, string MFG_DATE) { VW_GET_MAX_QTY_VENDOR_LOTRow rowVW_GET_MAX_QTY_VENDOR_LOTRow = ((VW_GET_MAX_QTY_VENDOR_LOTRow)(this.NewRow())); object[] columnValuesArray = new object[] { + idx, PART_NO, VENDOR_NM, BATCH_NO, QTY, CUST_CODE, - VENDOR_LOT}; + VENDOR_LOT, + SID, + MFG_DATE}; rowVW_GET_MAX_QTY_VENDOR_LOTRow.ItemArray = columnValuesArray; this.Rows.Add(rowVW_GET_MAX_QTY_VENDOR_LOTRow); return rowVW_GET_MAX_QTY_VENDOR_LOTRow; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public VW_GET_MAX_QTY_VENDOR_LOTRow FindByidx(int idx) { + return ((VW_GET_MAX_QTY_VENDOR_LOTRow)(this.Rows.Find(new object[] { + idx}))); + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public override global::System.Data.DataTable Clone() { @@ -785,17 +480,22 @@ namespace Project { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars() { + this.columnidx = base.Columns["idx"]; this.columnPART_NO = base.Columns["PART_NO"]; this.columnVENDOR_NM = base.Columns["VENDOR_NM"]; this.columnBATCH_NO = base.Columns["BATCH_NO"]; this.columnQTY = base.Columns["QTY"]; this.columnCUST_CODE = base.Columns["CUST_CODE"]; this.columnVENDOR_LOT = base.Columns["VENDOR_LOT"]; + this.columnSID = base.Columns["SID"]; + this.columnMFG_DATE = base.Columns["MFG_DATE"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitClass() { + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); this.columnPART_NO = new global::System.Data.DataColumn("PART_NO", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPART_NO); this.columnVENDOR_NM = new global::System.Data.DataColumn("VENDOR_NM", typeof(string), null, global::System.Data.MappingType.Element); @@ -808,15 +508,22 @@ namespace Project { base.Columns.Add(this.columnCUST_CODE); this.columnVENDOR_LOT = new global::System.Data.DataColumn("VENDOR_LOT", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnVENDOR_LOT); - this.columnPART_NO.AllowDBNull = false; - this.columnPART_NO.MaxLength = 50; + this.columnSID = new global::System.Data.DataColumn("SID", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSID); + this.columnMFG_DATE = new global::System.Data.DataColumn("MFG_DATE", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMFG_DATE); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columnidx.AllowDBNull = false; + this.columnidx.Unique = true; this.columnVENDOR_NM.AllowDBNull = false; - this.columnVENDOR_NM.MaxLength = 200; - this.columnBATCH_NO.MaxLength = 50; this.columnCUST_CODE.AllowDBNull = false; this.columnCUST_CODE.MaxLength = 50; this.columnVENDOR_LOT.AllowDBNull = false; this.columnVENDOR_LOT.MaxLength = 50; + this.columnSID.AllowDBNull = false; + this.columnSID.MaxLength = 50; + this.columnMFG_DATE.MaxLength = 8; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -943,110 +650,6 @@ namespace Project { } } - /// - ///Represents strongly named DataRow class. - /// - public partial class VW_GET_MAX_QTY_CUSTRow : global::System.Data.DataRow { - - private VW_GET_MAX_QTY_CUSTDataTable tableVW_GET_MAX_QTY_CUST; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal VW_GET_MAX_QTY_CUSTRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableVW_GET_MAX_QTY_CUST = ((VW_GET_MAX_QTY_CUSTDataTable)(this.Table)); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string PART_NO { - get { - return ((string)(this[this.tableVW_GET_MAX_QTY_CUST.PART_NOColumn])); - } - set { - this[this.tableVW_GET_MAX_QTY_CUST.PART_NOColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string VENDOR_NM { - get { - return ((string)(this[this.tableVW_GET_MAX_QTY_CUST.VENDOR_NMColumn])); - } - set { - this[this.tableVW_GET_MAX_QTY_CUST.VENDOR_NMColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string BATCH_NO { - get { - try { - return ((string)(this[this.tableVW_GET_MAX_QTY_CUST.BATCH_NOColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'VW_GET_MAX_QTY_CUST\' 테이블의 \'BATCH_NO\' 열의 값이 DBNull입니다.", e); - } - } - set { - this[this.tableVW_GET_MAX_QTY_CUST.BATCH_NOColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public decimal QTY { - get { - try { - return ((decimal)(this[this.tableVW_GET_MAX_QTY_CUST.QTYColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'VW_GET_MAX_QTY_CUST\' 테이블의 \'QTY\' 열의 값이 DBNull입니다.", e); - } - } - set { - this[this.tableVW_GET_MAX_QTY_CUST.QTYColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string CUST_CODE { - get { - return ((string)(this[this.tableVW_GET_MAX_QTY_CUST.CUST_CODEColumn])); - } - set { - this[this.tableVW_GET_MAX_QTY_CUST.CUST_CODEColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsBATCH_NONull() { - return this.IsNull(this.tableVW_GET_MAX_QTY_CUST.BATCH_NOColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetBATCH_NONull() { - this[this.tableVW_GET_MAX_QTY_CUST.BATCH_NOColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsQTYNull() { - return this.IsNull(this.tableVW_GET_MAX_QTY_CUST.QTYColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetQTYNull() { - this[this.tableVW_GET_MAX_QTY_CUST.QTYColumn] = global::System.Convert.DBNull; - } - } - /// ///Represents strongly named DataRow class. /// @@ -1061,11 +664,27 @@ namespace Project { this.tableVW_GET_MAX_QTY_VENDOR_LOT = ((VW_GET_MAX_QTY_VENDOR_LOTDataTable)(this.Table)); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int idx { + get { + return ((int)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.idxColumn])); + } + set { + this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.idxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string PART_NO { get { - return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.PART_NOColumn])); + if (this.IsPART_NONull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.PART_NOColumn])); + } } set { this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.PART_NOColumn] = value; @@ -1087,11 +706,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string BATCH_NO { get { - try { - return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.BATCH_NOColumn])); + if (this.IsBATCH_NONull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'VW_GET_MAX_QTY_VENDOR_LOT\' 테이블의 \'BATCH_NO\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.BATCH_NOColumn])); } } set { @@ -1137,6 +756,45 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string SID { + get { + return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.SIDColumn])); + } + set { + this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.SIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string MFG_DATE { + get { + if (this.IsMFG_DATENull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.MFG_DATEColumn])); + } + } + set { + this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.MFG_DATEColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsPART_NONull() { + return this.IsNull(this.tableVW_GET_MAX_QTY_VENDOR_LOT.PART_NOColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetPART_NONull() { + this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.PART_NOColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsBATCH_NONull() { @@ -1160,39 +818,17 @@ namespace Project { public void SetQTYNull() { this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.QTYColumn] = global::System.Convert.DBNull; } - } - - /// - ///Row event argument class - /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public class VW_GET_MAX_QTY_CUSTRowChangeEvent : global::System.EventArgs { - - private VW_GET_MAX_QTY_CUSTRow eventRow; - - private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTRowChangeEvent(VW_GET_MAX_QTY_CUSTRow row, global::System.Data.DataRowAction action) { - this.eventRow = row; - this.eventAction = action; + public bool IsMFG_DATENull() { + return this.IsNull(this.tableVW_GET_MAX_QTY_VENDOR_LOT.MFG_DATEColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTRow Row { - get { - return this.eventRow; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataRowAction Action { - get { - return this.eventAction; - } + public void SetMFG_DATENull() { + this[this.tableVW_GET_MAX_QTY_VENDOR_LOT.MFG_DATEColumn] = global::System.Convert.DBNull; } } @@ -1234,177 +870,6 @@ namespace Project { namespace Project.dsWMSTableAdapters { - /// - ///Represents the connection and commands used to retrieve and save data. - /// - [global::System.ComponentModel.DesignerCategoryAttribute("code")] - [global::System.ComponentModel.ToolboxItem(true)] - [global::System.ComponentModel.DataObjectAttribute(true)] - [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + - ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public partial class VW_GET_MAX_QTY_CUSTTableAdapter : global::System.ComponentModel.Component { - - private global::System.Data.SqlClient.SqlDataAdapter _adapter; - - private global::System.Data.SqlClient.SqlConnection _connection; - - private global::System.Data.SqlClient.SqlTransaction _transaction; - - private global::System.Data.SqlClient.SqlCommand[] _commandCollection; - - private bool _clearBeforeFill; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public VW_GET_MAX_QTY_CUSTTableAdapter() { - this.ClearBeforeFill = true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { - get { - if ((this._adapter == null)) { - this.InitAdapter(); - } - return this._adapter; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlConnection Connection { - get { - if ((this._connection == null)) { - this.InitConnection(); - } - return this._connection; - } - set { - this._connection = value; - if ((this.Adapter.InsertCommand != null)) { - this.Adapter.InsertCommand.Connection = value; - } - if ((this.Adapter.DeleteCommand != null)) { - this.Adapter.DeleteCommand.Connection = value; - } - if ((this.Adapter.UpdateCommand != null)) { - this.Adapter.UpdateCommand.Connection = value; - } - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - if ((this.CommandCollection[i] != null)) { - ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; - } - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlTransaction Transaction { - get { - return this._transaction; - } - set { - this._transaction = value; - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - this.CommandCollection[i].Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.DeleteCommand != null))) { - this.Adapter.DeleteCommand.Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.InsertCommand != null))) { - this.Adapter.InsertCommand.Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.UpdateCommand != null))) { - this.Adapter.UpdateCommand.Transaction = this._transaction; - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { - get { - if ((this._commandCollection == null)) { - this.InitCommandCollection(); - } - return this._commandCollection; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool ClearBeforeFill { - get { - return this._clearBeforeFill; - } - set { - this._clearBeforeFill = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitAdapter() { - this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); - global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); - tableMapping.SourceTable = "Table"; - tableMapping.DataSetTable = "VW_GET_MAX_QTY_CUST"; - tableMapping.ColumnMappings.Add("PART_NO", "PART_NO"); - tableMapping.ColumnMappings.Add("VENDOR_NM", "VENDOR_NM"); - tableMapping.ColumnMappings.Add("BATCH_NO", "BATCH_NO"); - tableMapping.ColumnMappings.Add("QTY", "QTY"); - tableMapping.ColumnMappings.Add("CUST_CODE", "CUST_CODE"); - this._adapter.TableMappings.Add(tableMapping); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitConnection() { - this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::Project.Properties.Settings.Default.WMS_DEV; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; - this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT VW_GET_MAX_QTY_CUST.*\r\nFROM VW_GET_MAX_QTY_CUST"; - this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsWMS.VW_GET_MAX_QTY_CUSTDataTable dataTable) { - this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((this.ClearBeforeFill == true)) { - dataTable.Clear(); - } - int returnValue = this.Adapter.Fill(dataTable); - return returnValue; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsWMS.VW_GET_MAX_QTY_CUSTDataTable GetData() { - this.Adapter.SelectCommand = this.CommandCollection[0]; - dsWMS.VW_GET_MAX_QTY_CUSTDataTable dataTable = new dsWMS.VW_GET_MAX_QTY_CUSTDataTable(); - this.Adapter.Fill(dataTable); - return dataTable; - } - } - /// ///Represents the connection and commands used to retrieve and save data. /// @@ -1532,6 +997,8 @@ namespace Project.dsWMSTableAdapters { tableMapping.ColumnMappings.Add("QTY", "QTY"); tableMapping.ColumnMappings.Add("CUST_CODE", "CUST_CODE"); tableMapping.ColumnMappings.Add("VENDOR_LOT", "VENDOR_LOT"); + tableMapping.ColumnMappings.Add("SID", "SID"); + tableMapping.ColumnMappings.Add("MFG_DATE", "MFG_DATE"); this._adapter.TableMappings.Add(tableMapping); } @@ -1548,7 +1015,8 @@ namespace Project.dsWMSTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT VW_GET_MAX_QTY_VENDOR_LOT.*\r\nFROM VW_GET_MAX_QTY_VENDOR_LOT"; + this._commandCollection[0].CommandText = "SELECT SID, PART_NO, MFG_DATE, VENDOR_NM, BATCH_NO, QTY, CUST_CODE, VENDOR_LOT\r\n" + + "FROM VW_GET_MAX_QTY_VENDOR_LOT"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } diff --git a/Handler/Project/dsWMS.xsd b/Handler/Project/dsWMS.xsd index 8361f4d..9168fae 100644 --- a/Handler/Project/dsWMS.xsd +++ b/Handler/Project/dsWMS.xsd @@ -8,33 +8,12 @@ - - - - - - SELECT VW_GET_MAX_QTY_CUST.* -FROM VW_GET_MAX_QTY_CUST - - - - - - - - - - - - - - - - SELECT VW_GET_MAX_QTY_VENDOR_LOT.* + + SELECT SID, PART_NO, MFG_DATE, VENDOR_NM, BATCH_NO, QTY, CUST_CODE, VENDOR_LOT FROM VW_GET_MAX_QTY_VENDOR_LOT @@ -48,6 +27,8 @@ FROM VW_GET_MAX_QTY_VENDOR_LOT + + @@ -77,84 +58,50 @@ FROM VW_GET_MAX_QTY_VENDOR_LOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Handler/Project/dsWMS.xss b/Handler/Project/dsWMS.xss index 4c5f091..6d9680d 100644 --- a/Handler/Project/dsWMS.xss +++ b/Handler/Project/dsWMS.xss @@ -4,10 +4,9 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + diff --git a/Handler/Project/fMain.Designer.cs b/Handler/Project/fMain.Designer.cs index 5412ba8..642dc49 100644 --- a/Handler/Project/fMain.Designer.cs +++ b/Handler/Project/fMain.Designer.cs @@ -30,7 +30,10 @@ { this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); @@ -188,9 +191,6 @@ arCtl.ListView2.Cell cell95 = new arCtl.ListView2.Cell(); arCtl.ListView2.Cell cell96 = new arCtl.ListView2.Cell(); arCtl.ListView2.ItemStyle itemStyle2 = new arCtl.ListView2.ItemStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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(); this.tmDisplay = new System.Windows.Forms.Timer(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.arLabel76 = new arCtl.arLabel(); @@ -213,8 +213,13 @@ this.arDatagridView1 = new arCtl.arDatagridView(); this.target = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.JTYPE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sTIMEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.PTIME = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.VNAME = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_loc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.qTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.qtymax = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.MFGDATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.VLOT = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -232,6 +237,8 @@ this.GUID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.새로고침ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dataSet1 = new Project.DataSet1(); this.cmCam = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.liveViewProcessOnOffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -277,6 +284,7 @@ this.screenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jOBStartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jObEndToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.multiSIDSelectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.motionParameterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.axis0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.axis1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -406,16 +414,11 @@ this.panel1 = new System.Windows.Forms.Panel(); this.hmi1 = new UIControl.HMI(); this.listView21 = new arCtl.ListView2(); - this.sTIMEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_loc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.qTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dataSet1 = new Project.DataSet1(); this.panBottom.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit(); this.cmCam.SuspendLayout(); this.panel37.SuspendLayout(); this.panel10.SuspendLayout(); @@ -442,8 +445,6 @@ this.panel9.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit(); this.SuspendLayout(); // // tmDisplay @@ -1097,6 +1098,16 @@ this.JTYPE.ReadOnly = true; this.JTYPE.Width = 81; // + // sTIMEDataGridViewTextBoxColumn + // + this.sTIMEDataGridViewTextBoxColumn.DataPropertyName = "STIME"; + dataGridViewCellStyle1.Format = "HH:mm:ss"; + this.sTIMEDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.sTIMEDataGridViewTextBoxColumn.HeaderText = "START"; + this.sTIMEDataGridViewTextBoxColumn.Name = "sTIMEDataGridViewTextBoxColumn"; + this.sTIMEDataGridViewTextBoxColumn.ReadOnly = true; + this.sTIMEDataGridViewTextBoxColumn.Width = 74; + // // PTIME // this.PTIME.DataPropertyName = "BATCH"; @@ -1107,6 +1118,27 @@ this.PTIME.ReadOnly = true; this.PTIME.Width = 77; // + // sIDDataGridViewTextBoxColumn + // + this.sIDDataGridViewTextBoxColumn.DataPropertyName = "SID"; + dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.sIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + this.sIDDataGridViewTextBoxColumn.HeaderText = "SID"; + this.sIDDataGridViewTextBoxColumn.Name = "sIDDataGridViewTextBoxColumn"; + this.sIDDataGridViewTextBoxColumn.ReadOnly = true; + this.sIDDataGridViewTextBoxColumn.Width = 57; + // + // rIDDataGridViewTextBoxColumn + // + this.rIDDataGridViewTextBoxColumn.DataPropertyName = "RID"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.rIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.rIDDataGridViewTextBoxColumn.HeaderText = "RID"; + this.rIDDataGridViewTextBoxColumn.Name = "rIDDataGridViewTextBoxColumn"; + this.rIDDataGridViewTextBoxColumn.ReadOnly = true; + this.rIDDataGridViewTextBoxColumn.Width = 58; + // // VNAME // this.VNAME.DataPropertyName = "VNAME"; @@ -1117,6 +1149,23 @@ this.VNAME.ReadOnly = true; this.VNAME.Width = 87; // + // dvc_loc + // + this.dvc_loc.DataPropertyName = "LOC"; + this.dvc_loc.HeaderText = "LOC"; + this.dvc_loc.Name = "dvc_loc"; + this.dvc_loc.ReadOnly = true; + this.dvc_loc.Visible = false; + this.dvc_loc.Width = 55; + // + // qTYDataGridViewTextBoxColumn + // + this.qTYDataGridViewTextBoxColumn.DataPropertyName = "QTY"; + this.qTYDataGridViewTextBoxColumn.HeaderText = "QTY"; + this.qTYDataGridViewTextBoxColumn.Name = "qTYDataGridViewTextBoxColumn"; + this.qTYDataGridViewTextBoxColumn.ReadOnly = true; + this.qTYDataGridViewTextBoxColumn.Width = 61; + // // qtymax // this.qtymax.DataPropertyName = "qtymax"; @@ -1266,6 +1315,17 @@ this.새로고침ToolStripMenuItem.Text = "새로고침"; this.새로고침ToolStripMenuItem.Click += new System.EventHandler(this.새로고침ToolStripMenuItem_Click_1); // + // bs + // + this.bs.DataMember = "K4EE_Component_Reel_Result"; + this.bs.DataSource = this.dataSet1; + this.bs.Sort = "STIME desc"; + // + // dataSet1 + // + this.dataSet1.DataSetName = "DataSet1"; + this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // cmCam // this.cmCam.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1579,7 +1639,7 @@ this.toolStripMenuItem16, this.getImageToolStripMenuItem}); this.cmDebug.Name = "cmVision"; - this.cmDebug.Size = new System.Drawing.Size(254, 590); + this.cmDebug.Size = new System.Drawing.Size(254, 612); // // inboundToolStripMenuItem // @@ -1743,7 +1803,8 @@ // this.screenToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.jOBStartToolStripMenuItem, - this.jObEndToolStripMenuItem}); + this.jObEndToolStripMenuItem, + this.multiSIDSelectToolStripMenuItem}); this.screenToolStripMenuItem.Name = "screenToolStripMenuItem"; this.screenToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.screenToolStripMenuItem.Text = "Screen"; @@ -1751,17 +1812,24 @@ // jOBStartToolStripMenuItem // this.jOBStartToolStripMenuItem.Name = "jOBStartToolStripMenuItem"; - this.jOBStartToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.jOBStartToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.jOBStartToolStripMenuItem.Text = "JOB Start"; this.jOBStartToolStripMenuItem.Click += new System.EventHandler(this.jOBStartToolStripMenuItem_Click); // // jObEndToolStripMenuItem // this.jObEndToolStripMenuItem.Name = "jObEndToolStripMenuItem"; - this.jObEndToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.jObEndToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.jObEndToolStripMenuItem.Text = "JOb End"; this.jObEndToolStripMenuItem.Click += new System.EventHandler(this.jObEndToolStripMenuItem_Click); // + // multiSIDSelectToolStripMenuItem + // + this.multiSIDSelectToolStripMenuItem.Name = "multiSIDSelectToolStripMenuItem"; + this.multiSIDSelectToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.multiSIDSelectToolStripMenuItem.Text = "Multi SID Select"; + this.multiSIDSelectToolStripMenuItem.Click += new System.EventHandler(this.multiSIDSelectToolStripMenuItem_Click); + // // motionParameterToolStripMenuItem // this.motionParameterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2207,7 +2275,7 @@ // this.모델선택ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40; this.모델선택ToolStripMenuItem.Name = "모델선택ToolStripMenuItem"; - this.모델선택ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.모델선택ToolStripMenuItem.Size = new System.Drawing.Size(150, 46); this.모델선택ToolStripMenuItem.Text = "작업 모델"; this.모델선택ToolStripMenuItem.Click += new System.EventHandler(this.모델선택ToolStripMenuItem_Click); // @@ -2215,20 +2283,20 @@ // this.btModelMot.Image = global::Project.Properties.Resources.Motor; this.btModelMot.Name = "btModelMot"; - this.btModelMot.Size = new System.Drawing.Size(126, 22); + this.btModelMot.Size = new System.Drawing.Size(150, 46); this.btModelMot.Text = "모션 모델"; this.btModelMot.Click += new System.EventHandler(this.toolStripMenuItem23_Click); // // toolStripMenuItem12 // this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(123, 6); + this.toolStripMenuItem12.Size = new System.Drawing.Size(147, 6); // // 바코드룰ToolStripMenuItem // this.바코드룰ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_add_40; this.바코드룰ToolStripMenuItem.Name = "바코드룰ToolStripMenuItem"; - this.바코드룰ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.바코드룰ToolStripMenuItem.Size = new System.Drawing.Size(150, 46); this.바코드룰ToolStripMenuItem.Text = "바코드 룰"; this.바코드룰ToolStripMenuItem.Click += new System.EventHandler(this.바코드룰ToolStripMenuItem_Click); // @@ -2236,7 +2304,7 @@ // this.프린트룰ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_printer_48; this.프린트룰ToolStripMenuItem.Name = "프린트룰ToolStripMenuItem"; - this.프린트룰ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.프린트룰ToolStripMenuItem.Size = new System.Drawing.Size(150, 46); this.프린트룰ToolStripMenuItem.Text = "프린트 룰"; this.프린트룰ToolStripMenuItem.Click += new System.EventHandler(this.프린트룰ToolStripMenuItem_Click); // @@ -2247,7 +2315,7 @@ this.인바운드데이터업데이트ToolStripMenuItem}); this.sID정보ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_save_to_grid_40; this.sID정보ToolStripMenuItem.Name = "sID정보ToolStripMenuItem"; - this.sID정보ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.sID정보ToolStripMenuItem.Size = new System.Drawing.Size(150, 46); this.sID정보ToolStripMenuItem.Text = "SID 정보"; this.sID정보ToolStripMenuItem.Click += new System.EventHandler(this.sID정보ToolStripMenuItem_Click); // @@ -2255,7 +2323,7 @@ // this.프로그램열기ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right; this.프로그램열기ToolStripMenuItem.Name = "프로그램열기ToolStripMenuItem"; - this.프로그램열기ToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.프로그램열기ToolStripMenuItem.Size = new System.Drawing.Size(246, 46); this.프로그램열기ToolStripMenuItem.Text = "프로그램 열기"; this.프로그램열기ToolStripMenuItem.Click += new System.EventHandler(this.프로그램열기ToolStripMenuItem_Click); // @@ -2263,7 +2331,7 @@ // this.인바운드데이터업데이트ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right; this.인바운드데이터업데이트ToolStripMenuItem.Name = "인바운드데이터업데이트ToolStripMenuItem"; - this.인바운드데이터업데이트ToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.인바운드데이터업데이트ToolStripMenuItem.Size = new System.Drawing.Size(246, 46); this.인바운드데이터업데이트ToolStripMenuItem.Text = "인바운드 데이터 업데이트"; this.인바운드데이터업데이트ToolStripMenuItem.Click += new System.EventHandler(this.인바운드데이터업데이트ToolStripMenuItem_Click); // @@ -2371,7 +2439,7 @@ // this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image"))); this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(134, 22); + this.toolStripMenuItem11.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem11.Text = "프로그램"; this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click); // @@ -2379,7 +2447,7 @@ // this.toolStripMenuItem13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem13.Image"))); this.toolStripMenuItem13.Name = "toolStripMenuItem13"; - this.toolStripMenuItem13.Size = new System.Drawing.Size(134, 22); + this.toolStripMenuItem13.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem13.Text = "로그"; this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click); // @@ -2387,7 +2455,7 @@ // this.toolStripMenuItem14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem14.Image"))); this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(134, 22); + this.toolStripMenuItem14.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem14.Text = "캡처"; this.toolStripMenuItem14.Click += new System.EventHandler(this.toolStripMenuItem14_Click); // @@ -2395,7 +2463,7 @@ // this.toolStripMenuItem15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem15.Image"))); this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(134, 22); + this.toolStripMenuItem15.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem15.Text = "저장데이터"; this.toolStripMenuItem15.Click += new System.EventHandler(this.toolStripMenuItem15_Click); // @@ -2452,7 +2520,7 @@ // this.btManage.Image = global::Project.Properties.Resources.icons8_control_panel_40; this.btManage.Name = "btManage"; - this.btManage.Size = new System.Drawing.Size(122, 22); + this.btManage.Size = new System.Drawing.Size(146, 46); this.btManage.Text = "관리"; this.btManage.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click_1); // @@ -2460,7 +2528,7 @@ // this.빠른실행ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40; this.빠른실행ToolStripMenuItem.Name = "빠른실행ToolStripMenuItem"; - this.빠른실행ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.빠른실행ToolStripMenuItem.Size = new System.Drawing.Size(146, 46); this.빠른실행ToolStripMenuItem.Text = "빠른실행"; this.빠른실행ToolStripMenuItem.Click += new System.EventHandler(this.빠른실행ToolStripMenuItem_Click); // @@ -2544,27 +2612,27 @@ this.toolStripMenuItem30}); this.바코드LToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Left; this.바코드LToolStripMenuItem.Name = "바코드LToolStripMenuItem"; - this.바코드LToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.바코드LToolStripMenuItem.Size = new System.Drawing.Size(178, 46); this.바코드LToolStripMenuItem.Text = "바코드"; this.바코드LToolStripMenuItem.Click += new System.EventHandler(this.button1_Click_1); // // 연결ToolStripMenuItem // this.연결ToolStripMenuItem.Name = "연결ToolStripMenuItem"; - this.연결ToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.연결ToolStripMenuItem.Size = new System.Drawing.Size(156, 46); this.연결ToolStripMenuItem.Text = "연결"; this.연결ToolStripMenuItem.Click += new System.EventHandler(this.연결ToolStripMenuItem_Click); // // toolStripMenuItem26 // this.toolStripMenuItem26.Name = "toolStripMenuItem26"; - this.toolStripMenuItem26.Size = new System.Drawing.Size(129, 6); + this.toolStripMenuItem26.Size = new System.Drawing.Size(153, 6); // // toolStripMenuItem21 // this.toolStripMenuItem21.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.toolStripMenuItem21.Name = "toolStripMenuItem21"; - this.toolStripMenuItem21.Size = new System.Drawing.Size(132, 22); + this.toolStripMenuItem21.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem21.Text = "Trigger On"; this.toolStripMenuItem21.Click += new System.EventHandler(this.toolStripMenuItem21_Click); // @@ -2572,20 +2640,20 @@ // this.toolStripMenuItem24.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.toolStripMenuItem24.Name = "toolStripMenuItem24"; - this.toolStripMenuItem24.Size = new System.Drawing.Size(132, 22); + this.toolStripMenuItem24.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem24.Text = "Trigger Off"; this.toolStripMenuItem24.Click += new System.EventHandler(this.toolStripMenuItem24_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(129, 6); + this.toolStripMenuItem6.Size = new System.Drawing.Size(153, 6); // // toolStripMenuItem28 // this.toolStripMenuItem28.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.toolStripMenuItem28.Name = "toolStripMenuItem28"; - this.toolStripMenuItem28.Size = new System.Drawing.Size(132, 22); + this.toolStripMenuItem28.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem28.Text = "Trigger On"; this.toolStripMenuItem28.Click += new System.EventHandler(this.toolStripMenuItem28_Click); // @@ -2593,7 +2661,7 @@ // this.toolStripMenuItem30.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.toolStripMenuItem30.Name = "toolStripMenuItem30"; - this.toolStripMenuItem30.Size = new System.Drawing.Size(132, 22); + this.toolStripMenuItem30.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem30.Text = "Trigger Off"; this.toolStripMenuItem30.Click += new System.EventHandler(this.toolStripMenuItem30_Click); // @@ -2612,27 +2680,27 @@ this.webManagerToolStripMenuItem}); this.바코드키엔스ToolStripMenuItem.Image = global::Project.Properties.Resources.Barcode; this.바코드키엔스ToolStripMenuItem.Name = "바코드키엔스ToolStripMenuItem"; - this.바코드키엔스ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.바코드키엔스ToolStripMenuItem.Size = new System.Drawing.Size(178, 46); this.바코드키엔스ToolStripMenuItem.Text = "바코드(키엔스)"; // // toolStripMenuItem17 // this.toolStripMenuItem17.Image = global::Project.Properties.Resources.icons8_camera_40; this.toolStripMenuItem17.Name = "toolStripMenuItem17"; - this.toolStripMenuItem17.Size = new System.Drawing.Size(149, 22); + this.toolStripMenuItem17.Size = new System.Drawing.Size(173, 46); this.toolStripMenuItem17.Text = "Get Image"; this.toolStripMenuItem17.Click += new System.EventHandler(this.toolStripMenuItem17_Click); // // toolStripMenuItem18 // this.toolStripMenuItem18.Name = "toolStripMenuItem18"; - this.toolStripMenuItem18.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem18.Size = new System.Drawing.Size(170, 6); // // triggerOnToolStripMenuItem1 // this.triggerOnToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.triggerOnToolStripMenuItem1.Name = "triggerOnToolStripMenuItem1"; - this.triggerOnToolStripMenuItem1.Size = new System.Drawing.Size(149, 22); + this.triggerOnToolStripMenuItem1.Size = new System.Drawing.Size(173, 46); this.triggerOnToolStripMenuItem1.Text = "Trigger On"; this.triggerOnToolStripMenuItem1.Click += new System.EventHandler(this.triggerOnToolStripMenuItem1_Click); // @@ -2640,20 +2708,20 @@ // this.triggerOffToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.triggerOffToolStripMenuItem1.Name = "triggerOffToolStripMenuItem1"; - this.triggerOffToolStripMenuItem1.Size = new System.Drawing.Size(149, 22); + this.triggerOffToolStripMenuItem1.Size = new System.Drawing.Size(173, 46); this.triggerOffToolStripMenuItem1.Text = "Trigger Off"; this.triggerOffToolStripMenuItem1.Click += new System.EventHandler(this.triggerOffToolStripMenuItem1_Click); // // toolStripMenuItem19 // this.toolStripMenuItem19.Name = "toolStripMenuItem19"; - this.toolStripMenuItem19.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem19.Size = new System.Drawing.Size(170, 6); // // connectToolStripMenuItem // this.connectToolStripMenuItem.Image = global::Project.Properties.Resources.Socket; this.connectToolStripMenuItem.Name = "connectToolStripMenuItem"; - this.connectToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.connectToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.connectToolStripMenuItem.Text = "Connect"; this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click); // @@ -2661,20 +2729,20 @@ // this.disConnectToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_unavailable_40; this.disConnectToolStripMenuItem.Name = "disConnectToolStripMenuItem"; - this.disConnectToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.disConnectToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.disConnectToolStripMenuItem.Text = "DisConnect"; this.disConnectToolStripMenuItem.Click += new System.EventHandler(this.disConnectToolStripMenuItem_Click); // // toolStripMenuItem20 // this.toolStripMenuItem20.Name = "toolStripMenuItem20"; - this.toolStripMenuItem20.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem20.Size = new System.Drawing.Size(170, 6); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_delete_40; this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -2682,7 +2750,7 @@ // this.webManagerToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_what_40; this.webManagerToolStripMenuItem.Name = "webManagerToolStripMenuItem"; - this.webManagerToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.webManagerToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.webManagerToolStripMenuItem.Text = "Web Manager"; this.webManagerToolStripMenuItem.Click += new System.EventHandler(this.webManagerToolStripMenuItem_Click); // @@ -5000,65 +5068,6 @@ this.listView21.Text = "listView21"; this.listView21.Click += new System.EventHandler(this.listView21_Click); // - // sTIMEDataGridViewTextBoxColumn - // - this.sTIMEDataGridViewTextBoxColumn.DataPropertyName = "STIME"; - dataGridViewCellStyle1.Format = "HH:mm:ss"; - this.sTIMEDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - this.sTIMEDataGridViewTextBoxColumn.HeaderText = "START"; - this.sTIMEDataGridViewTextBoxColumn.Name = "sTIMEDataGridViewTextBoxColumn"; - this.sTIMEDataGridViewTextBoxColumn.ReadOnly = true; - this.sTIMEDataGridViewTextBoxColumn.Width = 74; - // - // sIDDataGridViewTextBoxColumn - // - this.sIDDataGridViewTextBoxColumn.DataPropertyName = "SID"; - dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.sIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; - this.sIDDataGridViewTextBoxColumn.HeaderText = "SID"; - this.sIDDataGridViewTextBoxColumn.Name = "sIDDataGridViewTextBoxColumn"; - this.sIDDataGridViewTextBoxColumn.ReadOnly = true; - this.sIDDataGridViewTextBoxColumn.Width = 57; - // - // rIDDataGridViewTextBoxColumn - // - this.rIDDataGridViewTextBoxColumn.DataPropertyName = "RID"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.rIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; - this.rIDDataGridViewTextBoxColumn.HeaderText = "RID"; - this.rIDDataGridViewTextBoxColumn.Name = "rIDDataGridViewTextBoxColumn"; - this.rIDDataGridViewTextBoxColumn.ReadOnly = true; - this.rIDDataGridViewTextBoxColumn.Width = 58; - // - // dvc_loc - // - this.dvc_loc.DataPropertyName = "LOC"; - this.dvc_loc.HeaderText = "LOC"; - this.dvc_loc.Name = "dvc_loc"; - this.dvc_loc.ReadOnly = true; - this.dvc_loc.Visible = false; - this.dvc_loc.Width = 59; - // - // qTYDataGridViewTextBoxColumn - // - this.qTYDataGridViewTextBoxColumn.DataPropertyName = "QTY"; - this.qTYDataGridViewTextBoxColumn.HeaderText = "QTY"; - this.qTYDataGridViewTextBoxColumn.Name = "qTYDataGridViewTextBoxColumn"; - this.qTYDataGridViewTextBoxColumn.ReadOnly = true; - this.qTYDataGridViewTextBoxColumn.Width = 61; - // - // bs - // - this.bs.DataMember = "K4EE_Component_Reel_Result"; - this.bs.DataSource = this.dataSet1; - this.bs.Sort = "STIME desc"; - // - // dataSet1 - // - this.dataSet1.DataSetName = "DataSet1"; - this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // FMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -5082,6 +5091,8 @@ this.panBottom.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit(); this.cmCam.ResumeLayout(false); this.panel37.ResumeLayout(false); this.panel10.ResumeLayout(false); @@ -5109,8 +5120,6 @@ this.panel9.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -5340,6 +5349,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn GUID; private arCtl.arLabel arLabel1; private System.Windows.Forms.ToolStripButton btManualPrint; + private System.Windows.Forms.ToolStripMenuItem multiSIDSelectToolStripMenuItem; } } diff --git a/Handler/Project/fMain.cs b/Handler/Project/fMain.cs index 9c73db6..f5aa52e 100644 --- a/Handler/Project/fMain.cs +++ b/Handler/Project/fMain.cs @@ -1,19 +1,21 @@ -using Emgu.CV; +using AR; +using Chilkat; +using Emgu.CV; using Emgu.CV.Structure; +using Microsoft.Owin.Hosting; +using Project.Dialog; using System; +using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.Drawing; +using System.Linq; using System.Runtime.InteropServices; +using System.Security.Permissions; +using System.Threading.Tasks; using System.Windows.Forms; using UIControl; -using System.Linq; -using AR; -using System.Security.Permissions; -using Microsoft.Owin.Hosting; -using System.Collections.Generic; -using Chilkat; -using System.Threading.Tasks; +using static Project.Dialog.Debug.fSendInboutData; namespace Project { @@ -38,7 +40,7 @@ namespace Project Stopwatch watFps1 = new Stopwatch(); Stopwatch watFps2 = new Stopwatch(); - System.Threading.Thread thConnection; //연결체크 + System.Threading.Thread thConnection; //Connection check byte ConnectSeq = 0; DateTime AirOffStart = DateTime.Parse("1982-11-23"); DateTime EmergencyTime = DateTime.Now; @@ -101,7 +103,7 @@ namespace Project PUB.popup.needClose = true; if (PUB.sm.Step == eSMStep.RUN) { - UTIL.MsgE("동작 중에는 종료 할 수 없습니다."); + UTIL.MsgE("Cannot exit while system is running."); e.Cancel = true; return; } @@ -181,7 +183,7 @@ namespace Project hmi1.arVar_Port[2].MotorDir = true; } - //키엔스2개사용여부에따른 ui변경 + //UI changes based on whether 2 Keyence units are used if (SETTING.Data.Keyence_IPR.isEmpty()) { keyenceviewR.Visible = false; @@ -250,7 +252,7 @@ namespace Project var TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST); - PUB.log.AddI(string.Format($"목록 새로 고침({0}건) {TS1.TotalSeconds:N1}s", dataSet1.K4EE_Component_Reel_Result.Count)); + PUB.log.AddI(string.Format($"List refresh({0} items) {TS1.TotalSeconds:N1}s", dataSet1.K4EE_Component_Reel_Result.Count)); ////Summary //listView1.Items.Clear(); @@ -281,12 +283,12 @@ namespace Project //} //TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST); - //PUB.log.AddI($"요약{TS1.TotalSeconds:N1}s"); + //PUB.log.AddI($"Summary{TS1.TotalSeconds:N1}s"); } catch (Exception ex) { - PUB.log.AddE("목록 새로고침 실패:" + ex.Message); + PUB.log.AddE("List refresh failed:" + ex.Message); } } @@ -336,35 +338,35 @@ namespace Project this.Text = Application.ProductName + " ver " + Application.ProductVersion + " " + Application.CompanyName; PUB.init(); //public initialize - VAR.BOOL[eVarBool.Use_Conveyor] = PUB.uSetting.useConv; - groupBox3.Text = $"모델정보({AR.SETTING.Data.McName})"; + VAR.BOOL[eVarBool.Use_Conveyor] = SETTING.User.useConv; + groupBox3.Text = $"Model Info({AR.SETTING.Data.McName})"; UpdateControl(); PUB.log.RaiseMsg += Log_RaiseMsg; PUB.logKeyence.RaiseMsg += Log_RaiseMsg; PUB.logWS.RaiseMsg += LogWS_RaiseMsg; - //위치 레이아웃 off한다. + //Turn off position layout. //this.pPosL.Visible = false; //this.pPosC.Visible = false; //this.pPosR.Visible = false; this.Show(); // sbDevice.Text = ""; - SetStatusMessage("프로그램 초기화", Color.White, Color.White, Color.Tomato, Color.Black); + SetStatusMessage("Program initialization", Color.White, Color.White, Color.Tomato, Color.Black); - //피커 상태초기화 + //Initialize picker status foreach (var item in this.hmi1.arVar_Picker) item.Clear(); - //포트 상태 초기화 + //Initialize port status foreach (var item in this.hmi1.arVar_Port) item.Clear(); - PUB.flag.set(eVarBool.FG_DEBUG, true, "개발중"); + PUB.flag.set(eVarBool.FG_DEBUG, true, "Under development"); ShowDebugMenu(); ////'Application.DoEvents(); @@ -394,17 +396,17 @@ namespace Project PUB.remocon.PortName = portinfo[0]; if (portinfo.Length > 1) PUB.remocon.BaudRate = int.Parse(portinfo[1]); else PUB.remocon.BaudRate = 9600; - if (PUB.remocon.Open() == false) PUB.log.AddAT("디버깅포트 열기 실패(" + AR.SETTING.Data.Serial_Remocon + ")"); - else PUB.log.Add("디버깅포트 열기 성공(" + AR.SETTING.Data.Serial_Remocon + ")"); + if (PUB.remocon.Open() == false) PUB.log.AddAT("Debug port open failed(" + AR.SETTING.Data.Serial_Remocon + ")"); + else PUB.log.Add("Debug port open successful(" + AR.SETTING.Data.Serial_Remocon + ")"); - PUB.log.Add("상태머신 시작"); - PUB.sm.SetMsgOptOff(); //모든 메세지출력을 해제한다. (이벤트는 동작함) + PUB.log.Add("State machine started"); + PUB.sm.SetMsgOptOff(); //Disable all message output. (Events still function) PUB.sm.Running += SM_Loop; PUB.sm.SPS += SM_SPS; //###################################################### - //########## 아래 이벤트는 _11_SM_Events.cs 파일에 정의됨 + //########## The following events are defined in _11_SM_Events.cs file //###################################################### PUB.sm.StepChanged += SM_StepChanged; PUB.sm.Message += SM_Message; @@ -414,15 +416,15 @@ namespace Project PUB.sm.StateProgress += SM_StateProgress; PUB.sm.Start(); - //Fag 값 변화 + //Flag value changes //PUB.flag.ValueChanged += Flag_ValueChanged; VAR.BOOL.ValueChanged += Flag_ValueChanged; - //ILock 값 변화 + //ILock value changes for (int i = 0; i < PUB.iLock.Length; i++) PUB.iLock[i].ValueChanged += Lock_ValueChanged; - //ILock 값 변화 + //ILock value changes PUB.iLockPRL.ValueChanged += Lock_ValueChanged; PUB.iLockPRR.ValueChanged += Lock_ValueChanged; PUB.iLockVS0.ValueChanged += Lock_ValueChanged; @@ -442,7 +444,7 @@ namespace Project PUB.plc.Start(); - //연결체크용 쓰레드 + //Connection check thread var thStart = new System.Threading.ThreadStart(bwDeviceConnection); thConnection = new System.Threading.Thread(thStart); thConnection.IsBackground = true; @@ -452,7 +454,7 @@ namespace Project VAR.I32[eVarInt32.Front_Laser_Cleaning] += 1; - //조이스틱 설정 + //Joystick configuration PUB.joystick = new arDev.Joystick.JoystickRaw(); PUB.joystick.Changed += Joystick_Changed; PUB.joystick.Connected += Joystick_Connected; @@ -464,7 +466,7 @@ namespace Project PUB.joystick.Connect(AR.SETTING.Data.Jostick_vid, AR.SETTING.Data.Jostick_pid); } - //키엔스연결 + //Keyence connection if (SETTING.Data.Keyence_IPF.isEmpty() == false) { PUB.keyenceF = new Device.KeyenceBarcode(AR.SETTING.Data.Keyence_IPF); @@ -498,7 +500,7 @@ namespace Project // menu_logform(); } - //swplc 프로그램 실행 + //swPLC program execution var swplcfile = UTIL.MakePath("swplc", "swplc.exe"); if (System.IO.File.Exists(swplcfile)) { @@ -526,17 +528,17 @@ namespace Project { var data = e.StrValue.Replace("\r", "").Replace("\n", ""); bool findregex = false; - PUB.log.Add($"고정바코드수신\n{data}"); + PUB.log.Add($"Fixed barcode received\n{data}"); var cnt = BarcodeRegExProcess( PUB.Result.BCDPattern, PUB.Result.BCDIgnorePattern, PUB.Result.ItemDataC.VisionData, string.Empty, data, out bool IgnoreBarcode, out findregex); - if (IgnoreBarcode) PUB.log.AddE("무시바코드 입니다"); - else if (cnt.Item1 == 0) PUB.log.AddAT("(수동)바코드 적용값 없음"); - else PUB.log.Add($"(수동)바코드적용수:{cnt.Item1}"); + if (IgnoreBarcode) PUB.log.AddE("This is an ignore barcode"); + else if (cnt.Item1 == 0) PUB.log.AddAT("(Manual) No applicable barcode value"); + else PUB.log.Add($"(Manual) Barcode applied count:{cnt.Item1}"); - //다른모델에서 패턴이가능한것을 찾는다 + //Find patterns that are compatible with other models if ((cnt?.Item1 ?? 0) == 0) { var patterns = PUB.GetPatterns("%", false); @@ -544,25 +546,25 @@ namespace Project cnt = BarcodeRegExProcess(patterns, new System.Collections.Generic.List(), null, string.Empty, data, out bool igBarcode, out findregex); if (cnt.Item1 > 0) { - PUB.log.AddI("아래 바코드와 호환됩니다"); + PUB.log.AddI("Compatible with the following barcode"); foreach (var item in cnt.Item2) { - PUB.log.Add($"모델:{item}"); + PUB.log.Add($"Model:{item}"); } - //데이터가 1건이고 현재 모델과 이름이 다르면 추천한다 + //If there is 1 data item and the name is different from current model, recommend it if (cnt.Item2.Count == 1 && AR.SETTING.Data.Enable_AutoChangeModelbyHandBarcode) { var modelname = cnt.Item2[0].Split('|')[0]; if (PUB.Result.isSetvModel && modelname.Equals(PUB.Result.vModel.Title)) { - //동일바코드라서 추가 작업 없음 + //Same barcode, no additional work needed } else { if (PUB.mdm.dataSet.OPModel.Where(t => t.Title.Equals(modelname)).Any()) { - PUB.log.Add($"모델자동전환(고정바코드)"); + PUB.log.Add($"Model auto-switch (fixed barcode)"); PUB.SelectModelV(modelname); } } @@ -574,7 +576,7 @@ namespace Project void loader1_Message(object sender, HMI.MessageArgs e) { - //로더에서 발생한 메세지 + //Message generated from loader if (e.isError) PUB.log.AddE(e.Message); else PUB.log.Add(e.Message); } @@ -604,7 +606,7 @@ namespace Project //{ // if (PUB.keyenceR == null || PUB.keyenceR.IsConnect == false) // { - // PUB.log.AddAT($"바코드R가 연결되지 않아 설정 파일을 업로드하지 않습니다. 신규 작업 시작시 해당 정보는 재 전송 됩니다. 좌측하단의 바코드 연결을 확인 후 모델을 선택하시면 이 오류가 발생되지 않습니다"); + // PUB.log.AddAT($"Barcode R is not connected, so the configuration file will not be uploaded. This information will be retransmitted when starting a new job. This error will not occur if you check the barcode connection at the bottom left and select a model"); // return; // } @@ -622,7 +624,7 @@ namespace Project // var configfi = new System.IO.FileInfo(configpath); // if (configfi.Exists == false) // { - // PUB.log.AddAT($"바코드R 설정파일({configfi.Name})이 없습니다"); + // PUB.log.AddAT($"Barcode R configuration file ({configfi.Name}) does not exist"); // } // else // { @@ -635,13 +637,13 @@ namespace Project // ftp.Port = 21; // var UPFileName = @"\CONFIG\CONFIG.PTC"; // var upOk = ftp.Upload(UPFileName, configfi.FullName); - // if (upOk == false) PUB.log.AddE("바코드R 설정파일 업로드 실패"); - // else PUB.log.AddI($"바코드R 설정파일 업로드 완료({configfi.FullName})"); + // if (upOk == false) PUB.log.AddE("Barcode R configuration file upload failed"); + // else PUB.log.AddI($"Barcode R configuration file upload completed ({configfi.FullName})"); // if (PUB.keyenceR.IsConnect) PUB.keyenceR.Trigger(true); // } // catch (Exception ex) // { - // PUB.log.AddE($"바코드R FTP전송 실패:{ex.Message}"); + // PUB.log.AddE($"Barcode R FTP transfer failed: {ex.Message}"); // } // } //} @@ -651,7 +653,7 @@ namespace Project /// void UpdateSoftLimit() { - PUB.log.Add("모션 SOFT-LIMIT 설정"); + PUB.log.Add("Motion SOFT-LIMIT setting"); for (short i = 0; i < PUB.mot.DeviceCount; i++) { @@ -677,24 +679,24 @@ namespace Project if (PUB.sm.Step == eSMStep.RUN) { PUB.popup.setMessage("SYSTEM INNITIALIZE\n" + - "동작중에는 [초기화]를 실행할 수 없습니다\n" + - "방법 #1 => [중지] 버튼을 이용하여 시스템을 정지 후 다시 시도\n" + - "방법 #2 => [수동실행] 모드로 전환 후 다시 시도"); + "Cannot execute [Initialize] during operation\n" + + "Method #1 => Use [Stop] button to stop system then retry\n" + + "Method #2 => Switch to [Manual Execution] mode then retry"); } else if ( PUB.sm.getNewStep != eSMStep.HOME_FULL && PUB.sm.Step != eSMStep.HOME_FULL) { - PUB.log.Add("시스템상태를 RESET으로 전환 합니다"); + PUB.log.Add("Switching system status to RESET"); PUB.AddSystemLog(Application.ProductVersion, "MAIN", "SYSTEM RESET"); PUB.sm.SetNewStep(eSMStep.HOME_FULL); } - else PUB.log.AddAT("RESET 중이므로 RESET 버튼을 무시 합니다."); + else PUB.log.AddAT("RESET button ignored because system is already in RESET state."); } /// - /// 작업시작전 작업에대한 선택 + /// Task selection before starting work /// void Func_start_job_select() { @@ -704,7 +706,7 @@ namespace Project } else { - //로그창 지우기 + //Clear log window if (this.RtLog.InvokeRequired) RtLog.BeginInvoke(new Action(() => { RtLog.Clear(); })); else this.RtLog.Clear(); @@ -721,12 +723,12 @@ namespace Project var sb = new System.Text.StringBuilder(); - if (PUB.mot.IsInit == false) sb.AppendLine("▶ 모션 보드가 초기화 되지 않았습니다.\n문의 바랍니다"); - if (PUB.dio.IsInit == false) sb.AppendLine("▶ I/O 보드가 초기화 되지 않았습니다.\n문의 바랍니다"); - if (DIO.GetIOOutput(eDOName.SOL_AIR) == false) sb.AppendLine("▶ AIR 출력 안됨(전면의 AIR버튼을 누르세요)"); - if (DIO.GetIOInput(eDIName.AIR_DETECT) == false) sb.AppendLine("▶ AIR 감지 안됨(AIR 입력 및 출력상태를 확인하세요)"); + if (PUB.mot.IsInit == false) sb.AppendLine("▶ Motion board not initialized.\nPlease contact support"); + if (PUB.dio.IsInit == false) sb.AppendLine("▶ I/O board not initialized.\nPlease contact support"); + if (DIO.GetIOOutput(eDOName.SOL_AIR) == false) sb.AppendLine("▶ AIR output not active (Press the AIR button on the front panel)"); + if (DIO.GetIOInput(eDIName.AIR_DETECT) == false) sb.AppendLine("▶ AIR not detected (Check AIR input and output status)"); - if (PUB.mot.HasHomeSetOff == true) sb.AppendLine("▶ 홈 검색이 완료되지 않은 축이 있습니다(장치초기화를 먼저 실행 하세요)"); + if (PUB.mot.HasHomeSetOff == true) sb.AppendLine("▶ There are axes that have not completed home search (Execute device initialization first)"); if (sb.Length > 0) { @@ -734,7 +736,7 @@ namespace Project return; } - //작업형태를 선택하게 한다 + //Allow user to select work type Form f; @@ -745,7 +747,7 @@ namespace Project } else { - PUB.log.AddAT("작업 시작전 선택화면에서 사용자가 취소함"); + PUB.log.AddAT("User cancelled at task selection screen before starting work"); } } @@ -870,7 +872,7 @@ namespace Project { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } var cur = DIO.GetIOOutput(eDOName.ROOMLIGHT); @@ -893,7 +895,7 @@ namespace Project //if (System.IO.File.Exists(file) == false) //{ - // PUB.popup.setMessage("Result Viewer Error\n결과보기 파일이 존재하지 않습니다\n개발자에 문의 주세요(T.8567)\nFile : " + file); + // PUB.popup.setMessage("Result Viewer Error\nResult viewer file does not exist\nPlease contact developer (T.8567)\nFile : " + file); // return; //} //UTIL.RunProcess(file); @@ -925,7 +927,7 @@ namespace Project if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } @@ -934,7 +936,7 @@ namespace Project if (PUB.mot.HasHomeSetOff) { - msg.AppendLine("! 장치 초기화가 완료되지 않은 상태입니다\n! 장치초기화를 실행 하세요"); + msg.AppendLine("! Device initialization is not complete\n! Execute device initialization"); } if (PUB.sm.isRunning == true) @@ -944,22 +946,22 @@ namespace Project ////if (PUB.sm.Step == eSMStep.PAUSE) ////{ - //// msg.AppendLine("! RESET을 누른 후 다시 시도하세요"); + //// msg.AppendLine("! Press RESET and try again"); ////} if (DIO.IsEmergencyOn() == true) { - msg.AppendLine("! 비상정지를 해제하세요"); + msg.AppendLine("! Release emergency stop"); } if (DIO.isSaftyDoorF() == false) { - msg.AppendLine("!전면 도어가 열려 있습니다"); + msg.AppendLine("! Front door is open"); } if (DIO.isSaftyDoorR() == false) { - msg.AppendLine("!후면 도어가 열려 있습니다"); + msg.AppendLine("! Rear door is open"); } if (msg.Length > 0) @@ -970,7 +972,7 @@ namespace Project } msg.Clear(); - msg.AppendLine("Q. 작업을 취소하고 모션의 위치 초기화를 실행하시겠습니까?"); + msg.AppendLine("Q. Cancel work and execute motion position initialization?"); var dlgresult = UTIL.MsgQ(msg.ToString()); if (dlgresult != System.Windows.Forms.DialogResult.Yes) return; @@ -981,16 +983,16 @@ namespace Project void Run_MotionPositionReset() { PUB.flag.set(eVarBool.FG_USERSTEP, false, "Run_MotionPositionReset"); - PUB.log.AddAT("배출 및 원점이동 시작"); - PUB.AddSystemLog(Application.ProductVersion, "MAIN", "작업취소"); - PUB.sm.SetNewStep(eSMStep.HOME_QUICK);//실행모드로 변경 + PUB.log.AddAT("Starting discharge and home movement"); + PUB.AddSystemLog(Application.ProductVersion, "MAIN", "Cancel Work"); + PUB.sm.SetNewStep(eSMStep.HOME_QUICK);//Change to execution mode } private void arLabel14_Click(object sender, EventArgs e) { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } var msg = new System.Text.StringBuilder(); @@ -999,37 +1001,37 @@ namespace Project msg.AppendLine("*" + Lang.CAN_NOT_RUN_AUTOMODE); if (DIO.GetIOOutput(eDOName.SOL_AIR) == false) - msg.AppendLine("* 전면의 AIR버튼을 눌러서 AIR를 공급하세요"); + msg.AppendLine("* Press the AIR button on the front to supply AIR"); //if (DIO.GetIOOutput(eDOName.SOL_AIR) && DIO.GetIOInput(eDIName.AIR_DETECT) == false) - // msg.AppendLine("* AIR 감지 안됨, AIR 공급상태를 확인 하세요"); + // msg.AppendLine("* AIR not detected, please check AIR supply status"); if (DIO.GetIOInput(eDIName.L_PICK_BW) == false) { - msg.AppendLine("* 왼쪽 프린터 피커가 후진상태가 아닙니다."); + msg.AppendLine("* Left printer picker is not in reverse position."); } if (DIO.GetIOInput(eDIName.R_PICK_BW) == false) { - msg.AppendLine("* 오른쪽 프린터 피커가 후진상태가 아닙니다."); + msg.AppendLine("* Right printer picker is not in reverse position."); } if (AR.SETTING.Data.Enable_PickerCylinder) { if (DIO.GetIOInput(eDIName.L_CYLUP) == false) { - msg.AppendLine("* 왼쪽 프린터 피커 실린더가 UP상태가 아닙니다."); + msg.AppendLine("* Left printer picker cylinder is not in UP position."); } if (DIO.GetIOInput(eDIName.R_CYLUP) == false) { - msg.AppendLine("* 오른쪽 프린터 피커 실린더가 UP상태가 아닙니다."); + msg.AppendLine("* Right printer picker cylinder is not in UP position."); } } if (DIO.IsEmergencyOn() == true) - msg.AppendLine("* 비상정지 상태일때에는 움직일 수 없습니다."); + msg.AppendLine("* Cannot move when in emergency stop state."); if (PUB.sm.Step == eSMStep.RUN) - msg.AppendLine("* 동작중에는 초기화할 수 없습니다"); + msg.AppendLine("* Cannot initialize while in operation"); if (msg.Length > 0) { @@ -1039,18 +1041,18 @@ namespace Project //CMenuButton btYes = new CMenuButton //{ - // Text = "초기화", + // Text = "Initialize", // Tag = "yes", // BackColor = Color.Tomato, // OverColor = Color.Gold //}; - //CMenuButton btNo = new CMenuButton("취소", "NO"); - //var menu = new CMenu("모션의 홈 및 상태 초기화를 실행하시겠습니까?", "장치 초기화", "init", eMsgIcon.Alert, btYes, btNo); + //CMenuButton btNo = new CMenuButton("Cancel", "NO"); + //var menu = new CMenu("Do you want to execute motion home and status initialization?", "Device Initialization", "init", eMsgIcon.Alert, btYes, btNo); //loader1.AddMenu(menu); msg.Clear(); - msg.AppendLine("모션의 홈 및 상태의 초기화를 실행하시겠습니까?"); + msg.AppendLine("Execute motion home and status initialization?"); var dlgresult = UTIL.MsgQ(msg.ToString()); if (dlgresult != System.Windows.Forms.DialogResult.Yes) return; @@ -1074,7 +1076,7 @@ namespace Project { DIO.InitDIOSensitive(); - //핀정의 파일 업데이트 + //Pin definition file update DIO.Pin.SetInputData(PUB.mdm.dataSet.InputDescription); DIO.Pin.SetOutputData(PUB.mdm.dataSet.OutputDescription); @@ -1102,9 +1104,9 @@ namespace Project } } - groupBox3.Text = $"모델정보({PUB.MCCode}/{AR.SETTING.Data.McName})"; + groupBox3.Text = $"Model Info ({PUB.MCCode}/{AR.SETTING.Data.McName})"; - //프린터설정 - 201223 + //Printer setting - 201223 //PUB.PrinterL.printerName = COMM.SETTING.Data.PrintLeftName; //PUB.PrinterR.printerName = COMM.SETTING.Data.PrintRightName; UpdateControl(); @@ -1118,9 +1120,9 @@ namespace Project string file = System.IO.Path.Combine(UTIL.CurrentPath, "Manual", "Manual.pdf");// "manual.pdf"); if (System.IO.File.Exists(file) == false) { - UTIL.MsgE("사용설명서 파일이 존재하지 않습니다\n" + - "문의 : T8567 (장비기술 1파트)\n" + - "파일명 : " + file); + UTIL.MsgE("User manual file does not exist\n" + + "Contact : T8567 (Equipment Technology Team 1)\n" + + "File name : " + file); return; } UTIL.RunExplorer(file); @@ -1131,22 +1133,22 @@ namespace Project } - private void 맵데이터보기ToolStripMenuItem_Click(object sender, EventArgs e) + private void viewMapDataToolStripMenuItem_Click(object sender, EventArgs e) { } - private void 저장폴더열기ToolStripMenuItem_Click(object sender, EventArgs e) + private void openSaveFolderToolStripMenuItem_Click(object sender, EventArgs e) { } - private void 캡처ToolStripMenuItem1_Click(object sender, EventArgs e) + private void CaptureToolStripMenuItem1_Click(object sender, EventArgs e) { } - private void 저장ToolStripMenuItem_Click(object sender, EventArgs e) + private void saveToolStripMenuItem_Click(object sender, EventArgs e) { } @@ -1168,12 +1170,12 @@ namespace Project if (PUB.sm.Step != eSMStep.IDLE) { var dlg = UTIL.MsgQ( - "프로그램 상태를 초기화 하시겠습니까?\n\n" + - "진행 중인 사항은 모두 취소 됩니다.\n" + - "필요한 경우 [시스템초기화] 가 필요할 수 있습니다"); + "Initialize program status?\n\n" + + "All ongoing processes will be cancelled.\n" + + "[System initialization] may be required if necessary"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; } - else PUB.log.AddAT("대기상태일때에는 초기화 할 수 없습니다"); + else PUB.log.AddAT("Cannot initialize while in standby state"); PUB.log.Add("User Click : initialize", false); PUB.sm.SetNewStep(eSMStep.IDLE, true); @@ -1208,7 +1210,7 @@ namespace Project { var buttonOk = new CMenuButton("ON", "1"); var buttonNo = new CMenuButton("OFF", "0"); - var newmenu = new CMenu("AIR 공급 상태를 변경 합니다", "AIR CONTROL", "air", eMsgIcon.Error, buttonOk, buttonNo) + var newmenu = new CMenu("Change AIR supply status", "AIR CONTROL", "air", eMsgIcon.Error, buttonOk, buttonNo) { BorderColor = Color.Gray, }; @@ -1229,11 +1231,11 @@ namespace Project private void Loader1_ButtonClick(object sender, UIControl.HMI.MenuItemClickEventargs e) { - //버튼이 눌렸으므로 해당 메뉴는 소거해준다 + //Button was pressed, so remove the corresponding menu PUB.log.Add("Menu Button Click : " + e.item.Tag); if (e.item.menutag == null) { - //이곳은 메뉴가 아닌 일반 버튼이다 + //This is a regular button, not a menu if (e.item.Tag == "INPUTL") { @@ -1254,28 +1256,28 @@ namespace Project break; case "sample": if (e.item.Tag == "1") - PUB.log.Add("ok 버튼 클릭"); + PUB.log.Add("ok button clicked"); else - PUB.log.Add("no 버튼 클릭"); + PUB.log.Add("no button clicked"); break; case "air": if (e.item.Tag == "1") { DIO.SetAIR(true); - PUB.log.Add("사용자 air on"); + PUB.log.Add("User air on"); } else { DIO.SetAIR(false); - PUB.log.Add("사용자 air off"); + PUB.log.Add("User air off"); } break; } } - //마지막메뉴를 제거한다 + //Remove the last menu hmi1.DelMenu(); } @@ -1369,7 +1371,7 @@ namespace Project return null; } - private void 작업선택화면ToolStripMenuItem_Click(object sender, EventArgs e) + private void workSelectionScreenToolStripMenuItem_Click(object sender, EventArgs e) { var f = new Dialog.fDataBufferSIDRef(); f.TopMost = true; @@ -1386,11 +1388,11 @@ namespace Project if (PUB.flag.get(eVarBool.FG_DEBUG) == true) { - PUB.flag.set(eVarBool.FG_DEBUG, false, "개발중"); + PUB.flag.set(eVarBool.FG_DEBUG, false, "Under development"); } else { - PUB.flag.set(eVarBool.FG_DEBUG, true, "개발중"); + PUB.flag.set(eVarBool.FG_DEBUG, true, "Under development"); } ShowDebugMenu(); @@ -1431,7 +1433,7 @@ namespace Project //private void sbVisTitle1_Click(object sender, EventArgs e) //{ - // //키엔스로부터 다운로드 받아서 처리해야함 + // //Need to download from Keyence and process // var tempfile = System.IO.Path.Combine(Util.CurrentPath, "Temp", "Keyence", DateTime.Now.ToString("HHmmss_fff") + ".bmp"); // var fi = new System.IO.FileInfo(tempfile); // if (fi.Directory.Exists == false) fi.Directory.Create(); @@ -1474,7 +1476,7 @@ namespace Project void menu_barcodeconfirm() { - //이미지저장한다. + //Save image if (PUB.sm.Step != eSMStep.RUN && PUB.sm.Step != eSMStep.PAUSE && PUB.sm.Step != eSMStep.WAITSTART) { var tempfilF = System.IO.Path.Combine(UTIL.CurrentPath, "Temp", "keyenceF.bmp"); @@ -1504,7 +1506,7 @@ namespace Project { PUB.Result.ItemDataC.VisionData.SetImage(new Mat(fiF.FullName, Emgu.CV.CvEnum.ImreadModes.Grayscale)); } - else PUB.log.AddE($"키엔스 이미지 수집 실패"); + else PUB.log.AddE($"Keyence image collection failed"); } var f = new Dialog.fLoaderInfo(PUB.Result.ItemDataC.VisionData.bcdMessage); f.ShowDialog(); @@ -1529,7 +1531,7 @@ namespace Project if (PUB.sm.isRunning) { - UTIL.MsgE("동작중에는 카트교환을 할 수 없습니다\n'STOP' 버튼을 누른 후 다시 시도하세요"); + UTIL.MsgE("Cannot perform cart exchange during operation\nPress 'STOP' button then try again"); return; } @@ -1550,14 +1552,14 @@ namespace Project if (curMag == false) { PUB.log.Add($"MAGNET{index} ON by USER"); - DIO.SetPortMagnet(index, true); //켜는건 바로 할 수 있게 한다 + DIO.SetPortMagnet(index, true); //Allow immediate turn on } else { if (curLim == false) { - UTIL.MsgE("포트를 모두 내린 후 다시 시도하세요"); - DIO.SetPortMotor(index, eMotDir.CCW, true, "카트교환"); //포트를 자동으로 내려준다 + UTIL.MsgE("Lower all ports then try again"); + DIO.SetPortMotor(index, eMotDir.CCW, true, "Cart Exchange"); //Automatically lower the port return; } DIO.SetPortMagnet(index, false); @@ -1572,10 +1574,10 @@ namespace Project private void arLabel6_Click(object sender, EventArgs e) { - //포트내림 + //Lower port if (PUB.sm.isRunning) { - UTIL.MsgE("동작중에는 사용할 수 없습니다"); + UTIL.MsgE("Cannot use during operation"); return; } var index = int.Parse((sender as arCtl.arLabel).Tag.ToString()); @@ -1591,8 +1593,8 @@ namespace Project if (DIO.GetPortMotorRun(index) == true) DIO.SetPortMotor(index, eMotDir.CW, false, "UI"); else { - if (UTIL.MsgQ("포트를 내릴까요?") == DialogResult.Yes) - DIO.SetPortMotor(index, eMotDir.CCW, true, "UI포트내림"); + if (UTIL.MsgQ("Lower the port?") == DialogResult.Yes) + DIO.SetPortMotor(index, eMotDir.CCW, true, "UI Port Lower"); } } @@ -1601,10 +1603,10 @@ namespace Project private void arLabel11_Click_1(object sender, EventArgs e) { - //포트올림 + //Raise port if (PUB.sm.isRunning) { - UTIL.MsgE("동작중에는 사용할 수 없습니다"); + UTIL.MsgE("Cannot use during operation"); return; } var index = int.Parse((sender as arCtl.arLabel).Tag.ToString()); @@ -1619,7 +1621,7 @@ namespace Project if (DIO.GetPortMotorRun(index) == true) DIO.SetPortMotor(index, eMotDir.CCW, false, "UI"); else { - if (UTIL.MsgQ("포트를 올릴까요?") == DialogResult.Yes) + if (UTIL.MsgQ("Raise the port?") == DialogResult.Yes) DIO.SetPortMotor(index, eMotDir.CW, true, "UI"); } } @@ -1631,7 +1633,7 @@ namespace Project { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } ShowSummary(); @@ -1690,7 +1692,7 @@ namespace Project var exename = UTIL.MakePath("LogView.exe"); if (System.IO.File.Exists(exename) == false) { - UTIL.MsgE("로그 뷰어 파일이 없습니다\n문의 주세요(T8567)"); + UTIL.MsgE("Log viewer file not found\nPlease contact support (T8567)"); return; } @@ -1704,7 +1706,7 @@ namespace Project f.ShowDialog(); } - private void 새로고침ToolStripMenuItem_Click_1(object sender, EventArgs e) + private void refreshToolStripMenuItem_Click_1(object sender, EventArgs e) { RefreshList(); } @@ -1741,11 +1743,11 @@ namespace Project } - private void 빠른실행ToolStripMenuItem_Click(object sender, EventArgs e) + private void quickExecutionToolStripMenuItem_Click(object sender, EventArgs e) { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } if (PUB.sm.isRunning == true) @@ -1759,24 +1761,24 @@ namespace Project f.Show(); } - private void 관리ToolStripMenuItem_Click_1(object sender, EventArgs e) + private void managementToolStripMenuItem_Click_1(object sender, EventArgs e) { if (PUB.sm.isRunning) { - UTIL.MsgE("동작중에는 사용할 수 없습니다"); + UTIL.MsgE("Cannot use during operation"); return; } if (PUB.flag.get(eVarBool.FG_MOVE_PICKER)) { - UTIL.MsgE("해당 창이 열려 있습니다"); + UTIL.MsgE("The window is already open"); } else { var f = new Dialog.fPickerMove(); f.ShowDialog(); - //홈이 안잡혀있고, 센서가 중앙에 있다면 초기화를 묻는다 + //If home position is not set and sensor is in center, ask for initialization if (PUB.mot.HasHomeSetOff == true && DIO.GetIOInput(eDIName.PICKER_SAFE)) { btMReset.PerformClick(); @@ -1813,7 +1815,7 @@ namespace Project private void toolStripMenuItem15_Click(object sender, EventArgs e) { - var basepath = AR.SETTING.Data.GetPathData(); + var basepath = AR.SETTING.Data.GetDataPath(); var path = System.IO.Path.Combine( basepath, "History", DateTime.Now.Year.ToString("0000"), @@ -1822,7 +1824,7 @@ namespace Project if (System.IO.Directory.Exists(path)) UTIL.RunExplorer(path); else - UTIL.RunExplorer(System.IO.Path.Combine(AR.SETTING.Data.Path_Data, "History")); + UTIL.RunExplorer(System.IO.Path.Combine(AR.SETTING.Data.GetDataPath(), "History")); } private void bcdRegProcessClearToolStripMenuItem_Click(object sender, EventArgs e) @@ -1844,14 +1846,14 @@ namespace Project } } - private void 바코드룰ToolStripMenuItem_Click(object sender, EventArgs e) + private void BarcodeRuleToolStripMenuItem_Click(object sender, EventArgs e) { using (var f = new Dialog.RegExRule()) f.ShowDialog(); } - async private void 모델선택ToolStripMenuItem_Click(object sender, EventArgs e) + async private void ModelSelectionToolStripMenuItem_Click(object sender, EventArgs e) { if (PUB.sm.isRunning == true) { @@ -1864,11 +1866,11 @@ namespace Project { if (SETTING.Data.SystemBypass) { - UTIL.MsgI("환경설정에서 BYPASS 가 활성화 되었습니다\n" + - "선택된 모델과 상관없이 장비는 BYPASS 로 동작 합니다\n" + + UTIL.MsgI("BYPASS is enabled in settings\n" + + "Equipment will operate in BYPASS mode regardless of selected model\n" + "[SYSTEM BYPASS]\n" + - "1. 카메라 기능이 OFF 됩니다\n" + - "2. 프린터 기능이 OFF 됩니다"); + "1. Camera function will be OFF\n" + + "2. Printer function will be OFF"); } if (f.Value != "") { @@ -1879,44 +1881,44 @@ namespace Project if (VAR.BOOL[eVarBool.Use_Conveyor]) { - var dlg = UTIL.MsgQ("다른 장비도 모델을 변경 할까요?"); - if (dlg == DialogResult.Yes) - { - List urls = new List(); - var conv = VAR.BOOL[eVarBool.Use_Conveyor] ? "1" : "0"; - if (SETTING.Data.McName == "R1") - { - urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}"); - urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}"); - } - else if (SETTING.Data.McName == "R2") - { - urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}"); - urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}"); - } - else if (SETTING.Data.McName == "R3") - { - urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}"); - urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}"); - } + //var dlg = UTIL.MsgQ("Do you want to change the model for other equipment as well?"); + //if (dlg == DialogResult.Yes) + //{ + // List urls = new List(); + // var conv = VAR.BOOL[eVarBool.Use_Conveyor] ? "1" : "0"; + // if (SETTING.Data.McName == "R1") + // { + // urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}"); + // urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}"); + // } + // else if (SETTING.Data.McName == "R2") + // { + // urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}"); + // urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}"); + // } + // else if (SETTING.Data.McName == "R3") + // { + // urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}"); + // urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}"); + // } - await System.Threading.Tasks.Task.Run(() => - { - if (urls.Any()) - { - foreach (var url in urls) - { - PUB.log.AddI($"자동모델설정:{url}"); - var rlt = UTIL.GetStrfromurl(url, out bool iserr, 3000); - if (iserr) - { - PUB.log.Add($"모델설정실패:" + rlt); - } - } + // await System.Threading.Tasks.Task.Run(() => + // { + // if (urls.Any()) + // { + // foreach (var url in urls) + // { + // PUB.log.AddI($"Automatic model setting: {url}"); + // var rlt = UTIL.GetStrfromurl(url, out bool iserr, 3000); + // if (iserr) + // { + // PUB.log.Add($"Model setting failed: " + rlt); + // } + // } - } - }); - } + // } + // }); + //} } } @@ -1931,7 +1933,7 @@ namespace Project f.Show(); } - private void sID정보ToolStripMenuItem_Click(object sender, EventArgs e) + private void SIDInfoToolStripMenuItem_Click(object sender, EventArgs e) { } @@ -1943,13 +1945,13 @@ namespace Project private void lbMsg_Click(object sender, EventArgs e) { - //reset 기능 + //reset function PUB.Result.ItemDataC.VisionData.Clear("USER UI CLICK", true); PUB.flag.set(eVarBool.FG_END_VISIONL, false, "USER UI CLICK"); } - private void 프린트룰ToolStripMenuItem_Click(object sender, EventArgs e) + private void PrintRuleToolStripMenuItem_Click(object sender, EventArgs e) { var f = new Dialog.RegExPrintRule(); f.ShowDialog(); @@ -2053,7 +2055,7 @@ namespace Project { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } @@ -2078,32 +2080,32 @@ namespace Project needShowSummary = true; } - private void 연결ToolStripMenuItem_Click(object sender, EventArgs e) + private void ConnectToolStripMenuItem_Click(object sender, EventArgs e) { if (PUB.wsL != null && PUB.wsL.Connected) { - UTIL.MsgI("현재 프로그램이 연결되어 있습니다"); + UTIL.MsgI("Program is currently connected"); return; } - //카메라 l실행 + //camera execution if (AR.SETTING.Data.CameraLFile.isEmpty() == true) { - UTIL.MsgE("바코드 프로그램 파일명이 지정되지 않았습니다", true); + UTIL.MsgE("Barcode program filename not specified", true); return; } var fi = new System.IO.FileInfo(AR.SETTING.Data.CameraLFile); if (fi.Exists == false) { - UTIL.MsgE("비젼 프로그램 파일이 존재하지 않습니다\n" + fi.FullName); + UTIL.MsgE("Vision program file does not exist\n" + fi.FullName); return; } //var prc = null;// Util.CheckExistProcess("CrevisQRCode"); //if (prc == null) { - //Util.MsgI("바코드 프로그램을 새로 실행 했습니다\n잠시만 기다리면 실행 됩니다"); + //Util.MsgI("Barcode program has been launched\nIt will run after a moment"); UTIL.RunProcess(fi.FullName); } //else @@ -2145,8 +2147,12 @@ namespace Project private void manualPrintToolStripMenuItem_Click(object sender, EventArgs e) { - var f = new Dialog.fManualPrint0(); - f.ShowDialog(); + using (var f = new Dialog.fManualPrint0()) + if (f.ShowDialog() == DialogResult.OK) + { + var rlt = PUB.PrinterR.Print(f.reelinfo, true, false); + PUB.log.Add($"manual print:{PUB.PrinterR.qrData}"); + } } private void arDatagridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -2158,7 +2164,7 @@ namespace Project { if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) { - UTIL.MsgE("모션이 초기화 되지 않았습니다\n잠시 후 다시 시도하세요"); + UTIL.MsgE("Motion not initialized\nPlease try again later"); return; } //show io panerl @@ -2208,10 +2214,10 @@ namespace Project WS_Send(eWorkPort.Right, PUB.wsR, string.Empty, "OFF", string.Empty); } - private void 프로그램열기ToolStripMenuItem_Click(object sender, EventArgs e) + private void OpenProgramToolStripMenuItem_Click(object sender, EventArgs e) { var fn = AR.SETTING.Data.Sidinfofilename; - if (fn.isEmpty()) fn = UTIL.MakePath("sidinfo","update.exe"); + if (fn.isEmpty()) fn = UTIL.MakePath("sidinfo", "update.exe"); var fi = new System.IO.FileInfo(fn); if (fi.Exists == false) @@ -2224,14 +2230,14 @@ namespace Project UTIL.RunProcess(fi.FullName); } - async private void 인바운드데이터업데이트ToolStripMenuItem_Click(object sender, EventArgs e) + async private void InboundDataUpdateToolStripMenuItem_Click(object sender, EventArgs e) { var rlt = await PUB.UpdateSIDInfo(); if (rlt.Item1 == false) { - PUB.log.AddE($"인바운드 자료 업데이트 실패" + rlt.Item2); + PUB.log.AddE($"Inbound data update failed: " + rlt.Item2); } - else PUB.log.AddI($"인바운드 자료 업데이트 성공"); + else PUB.log.AddI($"Inbound data update successful"); } private void hmi1_ZoneItemClick(object sender, HMI.ZoneItemClickEventargs e) @@ -2239,23 +2245,123 @@ namespace Project var buttontag = e.item.Tag; var buttonidx = e.item.index; - //컨베이어모드에서는 클릭시 버퍼를 초기화한다. + //In conveyor mode, buffer is initialized when clicked. var cv = VAR.BOOL[eVarBool.Use_Conveyor]; if (cv && buttontag.StartsWith("PORT")) { - //클릭시 버퍼수량 제거 + //Remove buffer quantity when clicked if (buttonidx == 0) VAR.I32[eVarInt32.LEFT_ITEM_COUNT] = 0; else if (buttonidx == 2) VAR.I32[eVarInt32.RIGT_ITEM_COUNT] = 0; - PUB.log.AddAT($"사용자 버퍼 제거 {buttontag}:{buttonidx}"); + PUB.log.AddAT($"User buffer removed {buttontag}:{buttonidx}"); } } - + private void toolStripButton1_Click(object sender, EventArgs e) { using (var f = new Dialog.fManualPrint()) f.ShowDialog(); } + + private void multiSIDSelectToolStripMenuItem_Click(object sender, EventArgs e) + { + //select columns + List fields = new List(); + VAR.STR[eVarString.JOB_CUSTOMER_CODE] = "0000000001"; + var vCustCode = VAR.STR[eVarString.JOB_CUSTOMER_CODE]; + var vPartNo = ""; + var vVname = ""; + var vSID = ""; + var vBatch = ""; + var vLot = ""; + var vMFG = ""; + + if (PUB.Result.ItemDataC.VisionData.VLOT.isEmpty()) PUB.Result.ItemDataC.VisionData.VLOT = "4CB24QK1G"; + if (PUB.Result.ItemDataC.VisionData.MFGDATE.isEmpty()) PUB.Result.ItemDataC.VisionData.MFGDATE = "2501"; + if (PUB.Result.ItemDataC.VisionData.PARTNO.isEmpty()) PUB.Result.ItemDataC.VisionData.PARTNO = "parno"; + if (PUB.Result.ItemDataC.VisionData.QTY.isEmpty()) PUB.Result.ItemDataC.VisionData.QTY = "1000"; + + + using (var f = new Dialog.fManualPrint0( + fManualPrint0.eOpt.sid | fManualPrint0.eOpt.vlot | fManualPrint0.eOpt.partno | fManualPrint0.eOpt.vname)) + { + f.Text = "Input Data"; + if (f.ShowDialog() != DialogResult.OK) return; + vPartNo = f.reelinfo.PartNo; + vVname = f.reelinfo.venderName; + vSID = f.reelinfo.SID; + vLot = f.reelinfo.venderLot; + vMFG = f.reelinfo.mfg; + } + + if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode]) fields.Add("CUST_CODE"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo]) fields.Add("PART_NO"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName]) fields.Add("VENDOR_NM"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID]) fields.Add("SID"); + if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch]) fields.Add("BATCH_NO"); //220921 + + //where coluns + var Apply = true; + List wheres = new List(); + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) + { + if (vCustCode.isEmpty() == false) wheres.Add($"CUST_CODE='{vCustCode}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_PartNo]) + { + if (vPartNo.isEmpty() == false) wheres.Add($"PART_NO='{vPartNo}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_SID]) + { + if (vSID.isEmpty() == false) wheres.Add($"SID='{vSID}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013 + { + if (vLot.isEmpty() == false) wheres.Add($"VENDOR_LOT = '{vLot}'"); + else Apply = false; + } + + if (Apply == false) + { + UTIL.MsgE("Cannot proceed as condition data is not met"); + return; + } + if (fields.Any() == false) + { + UTIL.MsgE("Update column does not exist"); + return; + } + if (wheres.Any() == false) + { + UTIL.MsgE("Condition column does not exist"); + return; + } + + //if query data . no error + var mcname = VAR.BOOL[eVarBool.Use_Conveyor] ? PUB.MCCode : SETTING.Data.McName; + + var TableName = "VW_GET_MAX_QTY_VENDOR_LOT"; + var whereState = " where " + string.Join(" and ", wheres); + var selectFields = string.Join(",", fields); + + var SQL = $"select top 1 {selectFields} from {TableName} WITH(NOLOCK) {whereState}"; + var SQLC = $"select count(*) from {TableName} WITH(NOLOCK) {whereState}"; + + //If multiple information exists, it should be handled with selection screen + + VAR.STR[eVarString.MULTISID_QUERY] = $"select {selectFields} from {TableName} WITH(NOLOCK) {whereState}"; + VAR.STR[eVarString.MULTISID_FIELDS] = selectFields; + + PUB.Result.ItemDataC.VisionData.CUSTCODE = VAR.STR[eVarString.JOB_CUSTOMER_CODE]; + using (var f = new fSelectSIDInformation()) + if (f.ShowDialog() == DialogResult.OK) + { + + } + } } } \ No newline at end of file diff --git a/Handler/Project/fMain.resx b/Handler/Project/fMain.resx index 3afa86b..d368210 100644 --- a/Handler/Project/fMain.resx +++ b/Handler/Project/fMain.resx @@ -452,16 +452,16 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAISSURBVGhD7ZNBSxRhGMenL5DfYWG7qX2D7FaGsN7qViAo - QWIgMZiQjIRWhHpQGwp3xg3GHcXVFf0C6RdQtEsdytiudV7Yp33xv8zszPNCsDO7Dzg/+N3mef+/PayR - kZFxjRj93XhQqNV/FWpEaThSq18Wao37mEueqwF+PDnrPzGXPPxg8mIuebixNMRc8nBjaYi5hJg+PzFe - fCUlN5aGrT1j+uILKjqg9VgvfoCyY0KPcWNpGN5ERQeEHuPG0jC8iYoOCD3GjaVheBMV/8+kaQ1PmNbl - M9MiSV41zd9Dph6J8S2fmtYPZOrhDiWJTD3ckSSRqYc7kiQy9XBHkkSmHu5IksjUEz14+Hic+gcGKZ/P - d1W1+ejJRFuLEpl6oge9iG/ZP3i7rUWJTD3RA+7hbhrtQaae6AH3aDeN9iBTz9ikSWFzuVxPjfYgM47r - Hd5yytWTpuT6ByJF27FqRXaAio8eCPYY2QGf/N2/zIdCrf5BdkDR3zvjPxaoVz1FdoCzdbDJfizR8r6L - 7IDmf+A5+7FMp5AdUPQqQ055v/lPl69brt5BdkCpdHTT3vQbG16FJKsabd/vQ3Y7trv1/ePnHRJtafsb - cuOsbng7a0WPhLuN3DhLdvHlsu2QaD84M8iN82Zl9e7iyjpJdmFpfQi5cYjoxuzrd3uvrMXG3MJ7kqRq - mpl/W1GNyM3IyMjIuPYYxj/jh7eFcuEfNwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAITSURBVGhD7ZPBShtRFIanL1DfIZDu1L5B7a4qQty1uxYK + lUJFQWRQQYm0tpViXdg0LZgZI0wyKtGIvkD1BSraTbtoLem2brPIaS7+YSYz50IhM8kB54NvN+f+XxYx + EhISbhDjfxqjmVr9d6ZGFIdjtfplptYYxlz0XA/w49FZ/4W56OEHoxdz0cONxSHmoocbi0PMRcTM+akx + +42U3FgctvaMmYsvqOiA1mO9+AHKjvE9xo3FoX8TFR3ge4wbi0P/Jio6wPcYNxaH/k1U/D+TZnZkwsxe + vjCzJMnrpuUHyNQjMb7lczP7E5l6uENJIlMPdyRJZOrhjiSJTD3ckSSRqYc7kiQy9QQPHj5+Rv0Dg5RO + p7uq2nz0ZKKtRYlMPcGDXsS37B+829aiRKae4AH3cDcN9iBTT/CAe7SbBnuQqefppEl+U6lUTw32IDOM + 7RzdscrV06Zku4ciRduJakW2h4oPHgj2BNken9y9K+ZDoVb/Ituj4O6f8R8L1Kl+RbaHVTrcYj+WaPnA + RrZH8z8wzX4s0ylkexScypBVPmj+0+Vrl6v3kO1RLB7fzlmlxqZTIcmqxrzr9iG7nbxd+vF5e5dEW9z5 + jtwwG5vO7oeCQ8LdQW6YtXxh/n3eItF+tOaQG+bN+sb91+s5kuzKWm4IuWGI6NbCy9X9xaVXjaWVdyRJ + 1TS3/LaiGpGbkJCQkHDjMYx/jIq3apFTE6IAAAAASUVORK5CYII= diff --git a/Handler/Project_form2/Dialog/fLoaderInfo.cs b/Handler/Project_form2/Dialog/fLoaderInfo.cs index fc4cea5..2bdbf02 100644 --- a/Handler/Project_form2/Dialog/fLoaderInfo.cs +++ b/Handler/Project_form2/Dialog/fLoaderInfo.cs @@ -36,7 +36,7 @@ namespace Project.Dialog { this.lstErrmsg.BeginInvoke(new Action(() => { - //동일한 태그를 가진 항목이 존재하는가? + //Does an item with the same tag exist? if (lstErrmsg.FindString(msg) < 0) lstErrmsg.Items.Add(string.Format("{0}", msg)); })); @@ -51,7 +51,7 @@ namespace Project.Dialog private void FLoaderInfo_FormClosed(object sender, FormClosedEventArgs e) { - //이미지해제 210329 + //Image release 210329 if (this.iv1.Image != null) { this.iv1.Image.Dispose(); @@ -60,7 +60,7 @@ namespace Project.Dialog Pub.flag.set(eFlag.WAIT_LOADERINFO, false, "_CLOSE"); - //사용자가 정보를 정확히 입력하지 않고 닫았다 + //User closed without entering information correctly if (Pub.Result.ItemData[1].VisionData.Confirm == false) { if (Pub.sm.Step == StateMachine.eSMStep.RUN) @@ -72,7 +72,7 @@ namespace Project.Dialog private void fLoaderInfo_Load(object sender, EventArgs e) { - //현재 바코드가 읽었단 자료를 모두 표시한다. + //Display all data that the barcode has read. this.tbRID.Text = Pub.Result.ItemData[1].VisionData.RID; this.tbRID.Tag = Pub.Result.ItemData[1].VisionData.RID0; @@ -101,24 +101,24 @@ namespace Project.Dialog if (lbSID0.Text.isEmpty() == false) lbSID0.Tag = lbSID0.Text; - //수량메뉴얼입력칸 + //Quantity manual input field if (Pub.Result.Option_QtyUpdateM) { if (Pub.Result.ItemData[1].VisionData.QTYRQ == true) { - //수동입력이나 바코드에서 RQ값이 들어있는 상태이니 그것을 사용한다. + //Manual input or RQ value is in barcode, so use that. //lock (Pub.Result.ItemData[1].VisionData.barcodelist) { var rqBcd = Pub.Result.ItemData[1].VisionData.barcodelist.Where(t => t.Data.StartsWith("RQ")).FirstOrDefault(); if (rqBcd != null) { var newqty = rqBcd.Data.Substring(2).Trim(); - Pub.log.Add($"수량업데이트 {tbQTY.Text}->{newqty}"); + Pub.log.Add($"Quantity updated {tbQTY.Text}->{newqty}"); tbQTY.Text = newqty; } else { - Pub.log.AddAT("RQ가 설정되어있었으나 해당 값이 코드 목록에 없어 수량을 채우지 않습니다"); + Pub.log.AddAT("RQ was set but the value is not in the code list, so quantity is not filled"); } } @@ -127,14 +127,14 @@ namespace Project.Dialog } else { - //수량을 직접입력하는 경우이므로 수량값을 지워버린다. - Pub.log.Add($"수량업데이트 {tbQTY.Text}-> (직접입력으로인한삭제)"); + //Direct input for quantity, so clear the quantity value. + Pub.log.Add($"Quantity updated {tbQTY.Text}-> (deleted due to direct input)"); tbQTY.Text = string.Empty; } } else { - Pub.log.Add($"수량업데이트 {tbQTY.Text}->{Pub.Result.ItemData[1].VisionData.QTY}"); + Pub.log.Add($"Quantity updated {tbQTY.Text}->{Pub.Result.ItemData[1].VisionData.QTY}"); tbQTY.Text = Pub.Result.ItemData[1].VisionData.QTY; } @@ -185,7 +185,7 @@ namespace Project.Dialog if (tbRID.Text.isEmpty()) { if (custCode.isEmpty() == false) updaterid = true; - else Pub.log.AddAT("릴 아이디를 생성해야하는데 커스터머 코드가 없습니다."); + else Pub.log.AddAT("Need to generate Reel ID but customer code is missing."); } else if (custCode.isEmpty() == false) { @@ -331,7 +331,7 @@ namespace Project.Dialog //} if (this.TagStr.isEmpty()) { - Util.MsgE("데이터를 입력할 칸을 먼저 클릭 하세요"); + Util.MsgE("Please click the field to enter data first"); return; } var lvitem = this.lvbcdList.FocusedItem; diff --git a/Handler/ResultView/ResultView.csproj b/Handler/ResultView/ResultView.csproj index f9294a5..e271997 100644 --- a/Handler/ResultView/ResultView.csproj +++ b/Handler/ResultView/ResultView.csproj @@ -9,7 +9,7 @@ Properties ResultView ResultView - v4.7 + v4.8 512 diff --git a/Handler/STDLabelAttach(ATV).sln b/Handler/STDLabelAttach(ATV).sln index 2bb21b1..faee594 100644 --- a/Handler/STDLabelAttach(ATV).sln +++ b/Handler/STDLabelAttach(ATV).sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.6.33801.468 +# Visual Studio Express 15 for Windows Desktop +VisualStudioVersion = 15.0.28307.1000 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STDLabelAttach(ATV)", "Project\STDLabelAttach(ATV).csproj", "{65F3E762-800C-499E-862F-A535642EC59F}" EndProject diff --git a/Handler/Sub/CommData/Enum.cs b/Handler/Sub/CommData/Enum.cs index 6c0c85b..fbdc367 100644 --- a/Handler/Sub/CommData/Enum.cs +++ b/Handler/Sub/CommData/Enum.cs @@ -267,7 +267,15 @@ namespace AR FG_PORTL_ITEMON, FG_PORTR_ITEMON, + /// + /// 사용자가 바코드 확인 또는 정보를 편집하는 창 + /// FG_WAIT_LOADERINFO, + + /// + /// SID정보가 복수가 검출되었을때 사용자가 선택하는 창 + /// + FG_WAIT_INFOSELECT, /// /// 작업시작화면 /// @@ -284,7 +292,6 @@ namespace AR FG_USERSTEP, FG_MINSPACE, FG_DEBUG, - //RUN_INIT, VS_DETECT_REEL_L, VS_DETECT_REEL_R, @@ -301,8 +308,8 @@ namespace AR PrePick_ReelIDOld, PrePick_ReelIDTarget, JOB_CUSTOMER_CODE, - //JOB_BYPASS_SID, - //JOB_TYPE, + MULTISID_QUERY, + MULTISID_FIELDS, } public enum eVarTime diff --git a/Handler/Sub/Setting/Common.cs b/Handler/Sub/Setting/Common.cs index ddb993c..39054af 100644 --- a/Handler/Sub/Setting/Common.cs +++ b/Handler/Sub/Setting/Common.cs @@ -10,25 +10,7 @@ using System.Windows.Forms; namespace AR { - public class UserSetting : arUtil.Setting - { - public string customerlist { get; set; } - public UserSetting() - { - - } - public override void AfterLoad() - { - //throw new NotImplementedException(); - - } - public override void AfterSave() - { - //throw new NotImplementedException(); - } - } - - public class CommonSetting : arUtil.Setting + public class CommonSetting : Setting { public string WebAPI_R1 { get; set; } @@ -279,11 +261,10 @@ namespace AR public Boolean Enable_PickerCylinder { get; set; } - public string GetPathData() + public string GetDataPath() { - var path = AppDomain.CurrentDomain.BaseDirectory; - if (String.IsNullOrWhiteSpace(Path_Data)) return System.IO.Path.Combine(path, "SaveData"); - else return Path_Data; + var di = new System.IO.DirectoryInfo(this.Path_Data); + return di.FullName; } [Category("Function"), DisplayName("라벨QR코드검증"), Description("부착된 라벨의 QR코드를 인쇄데이터와 검증 합니다"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] @@ -330,18 +311,13 @@ namespace AR public int HostPortL { get; set; } [Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] public int HostPortR { get; set; } - [Category("Vision"), DisplayName("Camera Left Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] + [Category("Vision"), DisplayName("Camera Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] public string CameraLFile { get; set; } - //[Category("Vision"), DisplayName("Camera Right Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] - //public string CameraRFile { get; set; } - - [Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] public float AngleOffsetL { get; set; } [Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] public float AngleOffsetR { get; set; } - #endregion #region "Count Reset Setting" @@ -612,13 +588,11 @@ namespace AR if (Language.isEmpty()) Language = "Kor"; //if (Password_Setup.isEmpty()) Password_Setup = "0000"; - if (Path_Data == "") - Path_Data = System.IO.Path.Combine(currentpath, "SaveData"); - + if (Path_Data == "") Path_Data = @".\SaveData"; try { - if (System.IO.Directory.Exists(Path_Data) == false) - System.IO.Directory.CreateDirectory(Path_Data); + if (System.IO.Directory.Exists(GetDataPath()) == false) + System.IO.Directory.CreateDirectory(GetDataPath()); } catch { diff --git a/Handler/Sub/Setting/CounterSetting.cs b/Handler/Sub/Setting/CounterSetting.cs new file mode 100644 index 0000000..cf07c50 --- /dev/null +++ b/Handler/Sub/Setting/CounterSetting.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.ComponentModel; + +namespace AR +{ + public class CounterSetting : Setting + { + public int seq { get; set; } + public string DateStr { get; set; } + + + + public void ClearP() + { + CountV0 = CountV1 = CountV2 = CountE = CountP0 = CountP1 = CountP2 = CountPrintL = CountPrintR = 0; + this.Save(); + } + + public void ClearDay() + { + DateStr = string.Empty; + CountDP0 = CountDP1 = CountDP2 = CountDP3 = CountDP4 = 0; + this.Save(); + } + + public int CountD + { + get + { + return CountDP0 + CountDP1 + CountDP2 + CountDP3 + CountDP4; + } + } + public int Count + { + get + { + return CountP0 + CountP1 + CountP2 + CountPrintL + CountPrintR; + } + } + + public int CountDP0 { get; set; } + public int CountDP1 { get; set; } + public int CountDP2 { get; set; } + public int CountDP3 { get; set; } + public int CountDP4 { get; set; } + + + + + //메인카운터 + public int CountP0 { get; set; } + public int CountP1 { get; set; } + public int CountP2 { get; set; } + public int CountPrintL { get; set; } + public int CountPrintR { get; set; } + public int CountE { get; set; } + public int CountV0 { get; set; } + public int CountV1 { get; set; } + public int CountV2 { get; set; } + + + public CounterSetting() + { + this.filename = AR.UTIL.CurrentPath + "counter.xml"; + } + public override void AfterLoad() + { + //if (CountReset == null) CountReset = DateTime.Parse("1982-11-23"); + } + public override void AfterSave() + { + //throw new NotImplementedException(); + } + } +} diff --git a/Handler/Sub/Setting/SETTING.cs b/Handler/Sub/Setting/SETTING.cs index 16fe359..022b69b 100644 --- a/Handler/Sub/Setting/SETTING.cs +++ b/Handler/Sub/Setting/SETTING.cs @@ -5,6 +5,8 @@ namespace AR { public static class SETTING { + public static SystemSetting System; + public static CounterSetting Counter; public static CommonSetting Data; public static UserSetting User; public static Boolean isInit { get; private set; } = false; @@ -14,15 +16,18 @@ namespace AR Data.Load(); if (User == null) User = new UserSetting(); User.Load(); - + if (System == null) System = new SystemSetting(); + System.Load(); + if (Counter == null) Counter = new CounterSetting(); + Counter.Load(); isInit = true; - - } public static void Save() { Data.Save(); User.Save(); + System.Save(); + Counter.Save(); } diff --git a/Handler/Sub/Setting/Setting.csproj b/Handler/Sub/Setting/Setting.csproj index f2291de..484aa4e 100644 --- a/Handler/Sub/Setting/Setting.csproj +++ b/Handler/Sub/Setting/Setting.csproj @@ -34,13 +34,9 @@ false - - False + ..\..\DLL\arCommUtil.dll - - ..\..\DLL\ArSetting.Net4.dll - @@ -54,8 +50,11 @@ + + + \ No newline at end of file diff --git a/Handler/Sub/Setting/System_Setting.cs b/Handler/Sub/Setting/System_Setting.cs new file mode 100644 index 0000000..ef085c5 --- /dev/null +++ b/Handler/Sub/Setting/System_Setting.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.ComponentModel; + +namespace AR +{ + + public class SystemSetting : Setting + { + public int SaftySensor_Threshold { get; set; } + + #region "System Setting" + public int MotaxisCount { get; set; } + #endregion + + #region "Signal Reverse" + + + [Category("Signal Reverse")] + public Boolean ReverseSIG_Emgergency { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_ButtonAir { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_DoorF { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_DoorR { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_AirCheck { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PortLimitUp { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PortLimitDn { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PortDetect0Up { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PortDetect1Up { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PortDetect2Up { get; set; } + [Category("Signal Reverse")] + public Boolean ReverseSIG_PickerSafe { get; set; } + + [Category("Signal Reverse")] + public Boolean ReverseSIG_ExtConvReady { get; set; } + + #endregion + + + public SystemSetting() + { + this.filename = UTIL.CurrentPath + "system.xml"; + } + public override void AfterLoad() + { + MotaxisCount = 7; + } + public override void AfterSave() + { + //throw new NotImplementedException(); + } + } +} diff --git a/Handler/Sub/Setting/UserSetting.cs b/Handler/Sub/Setting/UserSetting.cs new file mode 100644 index 0000000..74f5ed2 --- /dev/null +++ b/Handler/Sub/Setting/UserSetting.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.ComponentModel; + + +namespace AR +{ + public class UserSetting : Setting + { + public string customerlist { get; set; } + public Boolean Option_QtyUpdate1 { get; set; } + public Boolean Option_PartUpdate { get; set; } + public Boolean Option_printforce1 { get; set; } + public Boolean Option_Confirm1 { get; set; } + public Boolean Option_AutoConfirm { get; set; } + public Boolean Option_vname { get; set; } + public Boolean Option_FixPrint1 { get; set; } + public string Option_PrintPos1 { get; set; } + public Boolean Option_SidConv { get; set; } + + //public Boolean Option_QtyUpdate3 { get; set; } + //public Boolean Option_printforce3 { get; set; } + //public Boolean Option_Confirm3 { get; set; } + //public Boolean Option_FixPrint3 { get; set; } + //public string Option_PrintPos3 { get; set; } + + public string LastJobUnP11 { get; set; } + public string LastJobUnP12 { get; set; } + public string LastJobUnP21 { get; set; } + public string LastJobUnP22 { get; set; } + public string LastJobUnP31 { get; set; } + public string LastJobUnP32 { get; set; } + public string LastJobUnP41 { get; set; } + public string LastJobUnP42 { get; set; } + + + public string LastLot { get; set; } + public string LastAltag { get; set; } + public string LastModelM { get; set; } + public string LastModelV { get; set; } + + public string LastMC { get; set; } + + public int jobtype { get; set; } + public int scantype { get; set; } + public bool useConv { get; set; } + public UserSetting() + { + this.filename = AppDomain.CurrentDomain.BaseDirectory + "UserSet.xml"; + } + + public override void AfterLoad() + { + + if (LastJobUnP11.isEmpty()) LastJobUnP11 = "AUTO"; + if (LastJobUnP12.isEmpty()) LastJobUnP12 = "AUTO"; + if (LastJobUnP21.isEmpty()) LastJobUnP21 = "AUTO"; + if (LastJobUnP22.isEmpty()) LastJobUnP22 = "AUTO"; + if (LastJobUnP31.isEmpty()) LastJobUnP31 = "AUTO"; + if (LastJobUnP32.isEmpty()) LastJobUnP32 = "AUTO"; + if (LastJobUnP41.isEmpty()) LastJobUnP41 = "AUTO"; + if (LastJobUnP42.isEmpty()) LastJobUnP42 = "AUTO"; + + } + public override void AfterSave() + { + //throw new NotImplementedException(); + } + } +} diff --git a/Handler/Sub/StdLabelPrint/StdLabelPrint.csproj b/Handler/Sub/StdLabelPrint/StdLabelPrint.csproj index 860798b..5b0bf36 100644 --- a/Handler/Sub/StdLabelPrint/StdLabelPrint.csproj +++ b/Handler/Sub/StdLabelPrint/StdLabelPrint.csproj @@ -9,7 +9,7 @@ Properties StdLabelPrint StdLabelPrint - v4.7 + v4.8 512 true diff --git a/Handler/Sub/arFrameControl/arFrameControl.csproj b/Handler/Sub/arFrameControl/arFrameControl.csproj index 3195060..70044ec 100644 --- a/Handler/Sub/arFrameControl/arFrameControl.csproj +++ b/Handler/Sub/arFrameControl/arFrameControl.csproj @@ -9,7 +9,7 @@ Properties arFrame.Control arFrameControl - v4.7 + v4.8 512 diff --git a/Handler/korean_files.txt b/Handler/korean_files.txt new file mode 100644 index 0000000..1800e53 --- /dev/null +++ b/Handler/korean_files.txt @@ -0,0 +1,232 @@ +./euresys/Form1.cs +./euresys/Form1.Designer.cs +./euresys/Program.cs +./euresys/Properties/AssemblyInfo.cs +./euresys/Properties/Resources.Designer.cs +./Project/Button/RESET.cs +./Project/Button/START.cs +./Project/Button/STOP.cs +./Project/Class/CHistoryJOB.cs +./Project/Class/CHistorySIDRef.cs +./Project/Class/Command.cs +./Project/Class/CResult.cs +./Project/Class/EEMStatus.cs +./Project/Class/EnumData.cs +./Project/Class/Enum_Mot.cs +./Project/Class/FTP/FTPClient.cs +./Project/Class/ItemData.cs +./Project/Class/JoystickRaw.cs +./Project/Class/KeyenceBarcodeData.cs +./Project/Class/ModelInfoM.cs +./Project/Class/ModelInfoV.cs +./Project/Class/Reel.cs +./Project/Class/VisionData.cs +./Project/Controller/ModelController.cs +./Project/Controller/StateController.cs +./Project/DataSet11.Designer.cs +./Project/Device/KeyenceBarcode.cs +./Project/Device/SATOPrinter.cs +./Project/Device/SATOPrinterAPI.cs +./Project/Device/StateMachine.cs +./Project/Device/TowerLamp.cs +./Project/Device/_CONNECTION.cs +./Project/Dialog/Debug/fSendInboutData.cs +./Project/Dialog/DIOMonitor.cs +./Project/Dialog/DIOMonitor.Designer.cs +./Project/Dialog/fDebug.cs +./Project/Dialog/fFinishJob.cs +./Project/Dialog/fFinishJob.Designer.cs +./Project/Dialog/fHistory.cs +./Project/Dialog/fHistory.Designer.cs +./Project/Dialog/fHistory.resx +./Project/Dialog/fImp.cs +./Project/Dialog/fLoaderInfo.cs +./Project/Dialog/fLoaderInfo.Designer.cs +./Project/Dialog/fLog.Designer.cs +./Project/Dialog/fManualPrint.cs +./Project/Dialog/fManualPrint.Designer.cs +./Project/Dialog/fManualPrint0.cs +./Project/Dialog/fManualPrint0.Designer.cs +./Project/Dialog/fMessageInput.Designer.cs +./Project/Dialog/fNewSID.cs +./Project/Dialog/fNewSID.Designer.cs +./Project/Dialog/fPickerMove.cs +./Project/Dialog/fPickerMove.Designer.cs +./Project/Dialog/fSavePosition.cs +./Project/Dialog/fSavePosition.Designer.cs +./Project/Dialog/fSelectCustInfo.Designer.cs +./Project/Dialog/fSelectDataList.cs +./Project/Dialog/fSelectDataList.Designer.cs +./Project/Dialog/fSelectDay.Designer.cs +./Project/Dialog/fSelectJob.cs +./Project/Dialog/fSelectJob.Designer.cs +./Project/Dialog/fSelectResult.cs +./Project/Dialog/fSelectResult.Designer.cs +./Project/Dialog/fSelectSID.cs +./Project/Dialog/fSelectSID.Designer.cs +./Project/Dialog/fSelectSIDInformation.cs +./Project/Dialog/fSelectSIDInformation.Designer.cs +./Project/Dialog/fSIDQty.cs +./Project/Dialog/fSIDQty.Designer.cs +./Project/Dialog/fswPLC.cs +./Project/Dialog/fswPLC.Designer.cs +./Project/Dialog/fVAR.Designer.cs +./Project/Dialog/fZPLEditor.cs +./Project/Dialog/Model_Motion.cs +./Project/Dialog/Model_Motion.Designer.cs +./Project/Dialog/Model_Motion_Desc.cs +./Project/Dialog/Model_Motion_Desc.Designer.cs +./Project/Dialog/Model_Operation.cs +./Project/Dialog/Model_Operation.Designer.cs +./Project/Dialog/Motion_MoveToGroup.cs +./Project/Dialog/Motion_MoveToGroup.Designer.cs +./Project/Dialog/Quick_Control.cs.cs +./Project/Dialog/Quick_Control.cs.Designer.cs +./Project/Dialog/RegExPrintRule.cs +./Project/Dialog/RegExPrintRule.Designer.cs +./Project/Dialog/RegExRule.cs +./Project/Dialog/RegExRule.Designer.cs +./Project/Dialog/RegExTest.cs +./Project/Dialog/UserControl1.Designer.cs +./Project/DSList.Designer.cs +./Project/DSSetup.Designer.cs +./Project/dsWMS.Designer.cs +./Project/fMain.cs +./Project/fMain.Designer.cs +./Project/Language/Lang.cs +./Project/Manager/DataBaseManagerCount.cs +./Project/Manager/DatabaseManagerHistory.cs +./Project/Manager/DatabaseManagerSIDHistory.cs +./Project/Manager/DBHelper.cs +./Project/Manager/ModelManager.cs +./Project/Model1.Context1.cs +./Project/Model11.cs +./Project/Model11.Designer.cs +./Project/Program.cs +./Project/Properties/AssemblyInfo.cs +./Project/Properties/Resources.Designer.cs +./Project/Properties/Settings.Designer.cs +./Project/Pub.cs +./Project/RunCode/Device/_Joystick.cs +./Project/RunCode/Device/_Keyence.cs +./Project/RunCode/Device/_Keyence_Rule_ReturnReel.cs +./Project/RunCode/Display/_Interval_1min.cs +./Project/RunCode/Display/_Interval_250ms.cs +./Project/RunCode/Display/_Interval_500ms.cs +./Project/RunCode/Display/_Interval_5min.cs +./Project/RunCode/Display/_TMDisplay.cs +./Project/RunCode/Display/_UpdateStatusMessage.cs +./Project/RunCode/Main/_SM_MAIN_ERROR.cs +./Project/RunCode/RunSequence/0_RUN_STARTCHK_SW.cs +./Project/RunCode/RunSequence/1_RUN_STARTCHK_HW.cs +./Project/RunCode/RunSequence/2_RUN_ROOT_SEQUENCE.cs +./Project/RunCode/RunSequence/3_KEYENCE_READ.cs +./Project/RunCode/RunSequence/4_PICKER_ON.cs +./Project/RunCode/RunSequence/4_PICKER_RETRY.cs +./Project/RunCode/RunSequence/5_PICKER_OFF.cs +./Project/RunCode/RunSequence/6.PRINT.cs +./Project/RunCode/RunSequence/7_PRINTER_ON.cs +./Project/RunCode/RunSequence/8_PRINTER_OFF.cs +./Project/RunCode/RunSequence/90_SaveData.cs +./Project/RunCode/RunSequence/9_QRValid.cs +./Project/RunCode/RunSequence/_RUN_MOT_PORT.cs +./Project/RunCode/StateMachine/_Events.cs +./Project/RunCode/StateMachine/_Loop.cs +./Project/RunCode/StateMachine/_SM_DIO.cs +./Project/RunCode/StateMachine/_SM_RUN.cs +./Project/RunCode/StateMachine/_SPS.cs +./Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs +./Project/RunCode/StateMachine/_SPS_RecvQRProcess.cs +./Project/RunCode/Step/_STEP_FINISH.cs +./Project/RunCode/Step/_STEP_HOME_CONFIRM.cs +./Project/RunCode/Step/_STEP_HOME_DELAY.cs +./Project/RunCode/Step/_STEP_HOME_FULL.cs +./Project/RunCode/Step/_STEP_HOME_QUICK.cs +./Project/RunCode/Step/_STEP_IDLE.cs +./Project/RunCode/Step/_STEP_INIT.cs +./Project/RunCode/Step/_STEP_RUN.cs +./Project/RunCode/_01_Input_Events.cs +./Project/RunCode/_02_Output_Events.cs +./Project/RunCode/_03_Interlock_Events.cs +./Project/RunCode/_04_Flag_Events.cs +./Project/RunCode/_97_Utility.cs +./Project/RunCode/_Close.cs +./Project/RunCode/_Motion.cs +./Project/RunCode/_SM_RUN.cs +./Project/RunCode/_Vision.cs +./Project/Setting/CounterSetting.cs +./Project/Setting/fSetting.cs +./Project/Setting/fSetting.Designer.cs +./Project/Setting/fSetting_ErrorMessage.cs +./Project/Setting/fSetting_ErrorMessage.Designer.cs +./Project/Setting/fSetting_IOMessage.cs +./Project/Setting/fSetting_IOMessage.Designer.cs +./Project/Setting/fSystem_MotParameter.cs +./Project/Setting/fSystem_MotParameter.Designer.cs +./Project/StartupAPI.cs +./Project/UIControl/CtlBase.Designer.cs +./Project/UIControl/CtlContainer.cs +./Project/UIControl/CtlContainer.Designer.cs +./Project/UIControl/CtlCylinder.cs +./Project/UIControl/CtlCylinder.Designer.cs +./Project/UIControl/CtlMotor.cs +./Project/UIControl/CtlMotor.Designer.cs +./Project/UIControl/CtlSensor.cs +./Project/UIControl/CtlSensor.Designer.cs +./Project/UIControl/CtlTowerLamp.cs +./Project/UIControl/CtlTowerLamp.Designer.cs +./Project/Util/Util.cs +./Project/Util/Util_DO.cs +./Project/Util/Util_Mot.cs +./Project/Util/Util_Vision.cs +./Project/Validation/Mot_Move.cs +./Project/Validation/Mot_ZL.cs +./Project_form2/Class/AmkorReelID.cs +./Project_form2/Class/CHistoryJOB.cs +./Project_form2/Class/CHistorySIDRef.cs +./Project_form2/Class/CResult.cs +./Project_form2/Class/EnumData.cs +./Project_form2/Class/ItemData.cs +./Project_form2/Class/JoystickRaw.cs +./Project_form2/Class/KeyenceBarcodeData.cs +./Project_form2/Class/ModelInfoM.cs +./Project_form2/Class/ModelInfoV.cs +./Project_form2/Class/VisionData.cs +./Project_form2/Component_Reel_CustInfo.cs +./Project_form2/Component_Reel_CustRule.cs +./Project_form2/Component_Reel_Info.cs +./Project_form2/Component_Reel_Result.cs +./Project_form2/Component_Reel_SIDConv.cs +./Project_form2/Component_Reel_SIDInfo.cs +./Project_form2/DataSet1.Designer.cs +./Project_form2/Device/Crevis.cs +./Project_form2/Dialog/fDebug.cs +./Project_form2/Dialog/fEmulator.cs +./Project_form2/Dialog/fFinishJob.cs +./Project_form2/Dialog/fFinishJob.Designer.cs +./Project_form2/Dialog/fImportSIDConv.cs +./Project_form2/Dialog/fImportSIDConv.Designer.cs +./Project_form2/Dialog/fImportSIDInfo.cs +./Project_form2/Dialog/fImportSIDInfo.Designer.cs +./Project_form2/Dialog/fLoaderInfo.cs +./Project_form2/Dialog/fLoaderInfo.Designer.cs +./Project_form2/Dialog/fNewReelID.cs +./Project_form2/Dialog/fNewReelID.Designer.cs +./Project_form2/Dialog/fNewSID.cs +./Project_form2/Dialog/fNewSID.Designer.cs +./Project_form2/Dialog/fPickerMove.cs +./Project_form2/Dialog/fPickerMove.Designer.cs +./Project_form2/Dialog/fSelectCustInfo.Designer.cs +./Project_form2/Dialog/fSelectDataList.cs +./Project_form2/Dialog/fSelectDataList.Designer.cs +./Project_form2/Dialog/fSelectDay.Designer.cs +./Project_form2/Dialog/fSelectJob.cs +./Project_form2/Dialog/fSelectJob.Designer.cs +./Project_form2/Dialog/fSelectResult.cs +./Project_form2/Dialog/fSelectResult.Designer.cs +./Project_form2/Dialog/fSelectSID.cs +./Project_form2/Dialog/fSelectSID.Designer.cs +./Project_form2/Dialog/fSIDQty.cs +./Project_form2/Dialog/fSIDQty.Designer.cs +./Project_form2/Dialog/QuickControl.cs +./Project_form2/Dialog/QuickControl.Designer.cs diff --git a/SID Information/.gitignore b/SID Information/.gitignore deleted file mode 100644 index c2f4601..0000000 --- a/SID Information/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.suo -*.user -*.pdb -bin -obj -desktop.ini -.vs -packages \ No newline at end of file