From 5a2eeed3c431ef64ee0ad42586f509831151eca4 Mon Sep 17 00:00:00 2001 From: atvstdla Date: Mon, 29 Sep 2025 17:38:12 +0900 Subject: [PATCH] .. --- Handler/Project/Class/ItemData.cs | 1 + Handler/Project/Class/ModelInfoV.cs | 4 +- Handler/Project/Class/VisionData.cs | 16 + Handler/Project/DataSet1.xsd | 155 +++-- Handler/Project/DataSet1.xss | 34 +- Handler/Project/DataSet11.Designer.cs | 350 +++++++--- .../Dialog/Model_Operation.Designer.cs | 301 ++++++-- Handler/Project/Dialog/Model_Operation.cs | 31 + Handler/Project/Dialog/Model_Operation.resx | 3 + Handler/Project/Dialog/fSelectJob.Designer.cs | 292 ++++++-- Handler/Project/Dialog/fSelectJob.cs | 58 +- .../Project/Properties/Settings.Designer.cs | 2 +- Handler/Project/Properties/Settings.settings | 6 +- Handler/Project/RunCode/Device/_Keyence.cs | 8 +- .../RunCode/RunSequence/3_KEYENCE_READ.cs | 550 +-------------- .../StateMachine/_SPS_BarcodeProcess.cs | 439 +----------- Handler/Project/STDLabelAttach(ATV).csproj | 4 +- Handler/Project/Util/BarcodeDataProcessing.cs | 644 ++++++++++++++++++ Handler/Project/Util/Util.cs | 191 ------ Handler/Project/fMain.Designer.cs | 14 +- Handler/Project/fMain.cs | 46 +- Handler/Project/fMain.resx | 20 +- Handler/Sub/CommData/Enum.cs | 17 + Handler/swPLC | 2 +- 24 files changed, 1698 insertions(+), 1490 deletions(-) create mode 100644 Handler/Project/Util/BarcodeDataProcessing.cs delete mode 100644 Handler/Project/Util/Util.cs diff --git a/Handler/Project/Class/ItemData.cs b/Handler/Project/Class/ItemData.cs index 18aad3a..84a921c 100644 --- a/Handler/Project/Class/ItemData.cs +++ b/Handler/Project/Class/ItemData.cs @@ -113,5 +113,6 @@ namespace Project.Class PUB.AddDebugLog($"After item copy target rid : {obj.VisionData.RID}, guid={obj.guid}"); } + } } diff --git a/Handler/Project/Class/ModelInfoV.cs b/Handler/Project/Class/ModelInfoV.cs index 2d95c73..0b6a8cf 100644 --- a/Handler/Project/Class/ModelInfoV.cs +++ b/Handler/Project/Class/ModelInfoV.cs @@ -29,6 +29,7 @@ namespace Project public Boolean BCD_DM { get; set; } public UInt16 vOption { get; set; } + public UInt16 vWMSInfo { get; set; } public UInt16 vSIDInfo { get; set; } public UInt16 vJobInfo { get; set; } public UInt16 vSIDConv1 { get; set; } @@ -49,7 +50,7 @@ namespace Project public ModelInfoV() { - vOption = vSIDInfo = vJobInfo = vSIDConv1 = 0; + vOption = vWMSInfo = vSIDInfo = vJobInfo = vSIDConv1 = 0; bOwnZPL = false; } @@ -66,6 +67,7 @@ namespace Project this.BCD_DM = dr.BCD_DM; this.vOption = dr.vOption; this.vJobInfo = dr.vJobInfo; + this.vWMSInfo = dr.vWMSInfo; this.vSIDInfo = dr.vSIDInfo; this.vSIDConv1 = dr.vSIDConv; this.Def_MFG = dr.Def_MFG; diff --git a/Handler/Project/Class/VisionData.cs b/Handler/Project/Class/VisionData.cs index 00fb115..3aa732d 100644 --- a/Handler/Project/Class/VisionData.cs +++ b/Handler/Project/Class/VisionData.cs @@ -25,6 +25,22 @@ namespace Project.Class public string FileNameU; //언로딩존 촬영 public Boolean Complete; + public override string ToString() + { + var sb = new StringBuilder(); + sb.AppendLine($"SID:{SID}:{(SID_Trust ? "O" : "X")}"); + sb.AppendLine($"RID:{RID}:{(RID_Trust ? "O" : "X")}"); + sb.AppendLine($"LOT:{VLOT}:{(VLOT_Trust ? "O" : "X")}"); + sb.AppendLine($"QTY:{QTY}:{(QTY_Trust ? "O" : "X")}"); + sb.AppendLine($"BAT:{BATCH}"); + sb.AppendLine($"MFG:{MFGDATE}:{(MFGDATE_Trust ? "O" : "X")}"); + sb.AppendLine($"CPN:{PARTNO}:{(PARTNO_Trust ? "O" : "X")}"); + + sb.AppendLine($"RID2:{RID2}"); + sb.AppendLine($"RIDNew:{RIDNew}"); + sb.AppendLine($"SID0:{SID0}"); + return sb.ToString(); + } //public Boolean AngleQR { get; set; } //public Boolean AngleSTD { get; set; } //public double Angle { get; set; } diff --git a/Handler/Project/DataSet1.xsd b/Handler/Project/DataSet1.xsd index 5adcc67..954635c 100644 --- a/Handler/Project/DataSet1.xsd +++ b/Handler/Project/DataSet1.xsd @@ -831,96 +831,102 @@ WHERE (MC = @mcname) - - DELETE FROM [K4EE_Component_Reel_PreSet] WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid))) + + DELETE FROM [K4EE_Component_Reel_PreSet] WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid)) AND ((@IsNull_vWMSInfo = 1 AND [vWMSInfo] IS NULL) OR ([vWMSInfo] = @Original_vWMSInfo))) - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - INSERT INTO [K4EE_Component_Reel_PreSet] ([MC], [Title], [Remark], [wdate], [vOption], [vJobInfo], [vSidInfo], [vServerWrite], [jobtype], [bypasssid]) VALUES (@MC, @Title, @Remark, @wdate, @vOption, @vJobInfo, @vSidInfo, @vServerWrite, @jobtype, @bypasssid); -SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid FROM Component_Reel_PreSet WHERE (idx = SCOPE_IDENTITY()) + + INSERT INTO [K4EE_Component_Reel_PreSet] ([MC], [Title], [Remark], [wdate], [vOption], [vJobInfo], [vSidInfo], [vServerWrite], [jobtype], [bypasssid], [vWMSInfo]) VALUES (@MC, @Title, @Remark, @wdate, @vOption, @vJobInfo, @vSidInfo, @vServerWrite, @jobtype, @bypasssid, @vWMSInfo); +SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo FROM K4EE_Component_Reel_PreSet WHERE (idx = SCOPE_IDENTITY()) - - - - - - - - - - + + + + + + + + + + + - SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid -FROM K4EE_Component_Reel_PreSet -WHERE (ISNULL(MC, '') = @mc) + SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo +FROM K4EE_Component_Reel_PreSet +WHERE (ISNULL(MC, '') = @mc) - - UPDATE [K4EE_Component_Reel_PreSet] SET [MC] = @MC, [Title] = @Title, [Remark] = @Remark, [wdate] = @wdate, [vOption] = @vOption, [vJobInfo] = @vJobInfo, [vSidInfo] = @vSidInfo, [vServerWrite] = @vServerWrite, [jobtype] = @jobtype, [bypasssid] = @bypasssid WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid))); -SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid FROM Component_Reel_PreSet WHERE (idx = @idx) + + UPDATE [K4EE_Component_Reel_PreSet] SET [MC] = @MC, [Title] = @Title, [Remark] = @Remark, [wdate] = @wdate, [vOption] = @vOption, [vJobInfo] = @vJobInfo, [vSidInfo] = @vSidInfo, [vServerWrite] = @vServerWrite, [jobtype] = @jobtype, [bypasssid] = @bypasssid, [vWMSInfo] = @vWMSInfo WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid)) AND ((@IsNull_vWMSInfo = 1 AND [vWMSInfo] IS NULL) OR ([vWMSInfo] = @Original_vWMSInfo))); +SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo FROM K4EE_Component_Reel_PreSet WHERE (idx = @idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -938,6 +944,7 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, + @@ -1316,7 +1323,8 @@ WHERE (iNBOUND = 'OK') AND (STIME >= @stime) AND (SID = @sid) AND (BAT - + + @@ -1802,6 +1810,7 @@ WHERE (iNBOUND = 'OK') AND (STIME >= @stime) AND (SID = @sid) AND (BAT + diff --git a/Handler/Project/DataSet1.xss b/Handler/Project/DataSet1.xss index 3caef07..dead035 100644 --- a/Handler/Project/DataSet1.xss +++ b/Handler/Project/DataSet1.xss @@ -4,33 +4,33 @@ 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 1060f3e..b701f49 100644 --- a/Handler/Project/DataSet11.Designer.cs +++ b/Handler/Project/DataSet11.Designer.cs @@ -3118,6 +3118,8 @@ namespace Project { private global::System.Data.DataColumn columnbypasssid; + private global::System.Data.DataColumn columnvWMSInfo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public K4EE_Component_Reel_PreSetDataTable() { @@ -3239,6 +3241,14 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn vWMSInfoColumn { + get { + return this.columnvWMSInfo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3276,7 +3286,7 @@ namespace Project { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public K4EE_Component_Reel_PreSetRow AddK4EE_Component_Reel_PreSetRow(string MC, string Title, string Remark, System.DateTime wdate, int vOption, int vJobInfo, int vSidInfo, int vServerWrite, string jobtype, string bypasssid) { + public K4EE_Component_Reel_PreSetRow AddK4EE_Component_Reel_PreSetRow(string MC, string Title, string Remark, System.DateTime wdate, int vOption, int vJobInfo, int vSidInfo, int vServerWrite, string jobtype, string bypasssid, int vWMSInfo) { K4EE_Component_Reel_PreSetRow rowK4EE_Component_Reel_PreSetRow = ((K4EE_Component_Reel_PreSetRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3289,7 +3299,8 @@ namespace Project { vSidInfo, vServerWrite, jobtype, - bypasssid}; + bypasssid, + vWMSInfo}; rowK4EE_Component_Reel_PreSetRow.ItemArray = columnValuesArray; this.Rows.Add(rowK4EE_Component_Reel_PreSetRow); return rowK4EE_Component_Reel_PreSetRow; @@ -3330,6 +3341,7 @@ namespace Project { this.columnvServerWrite = base.Columns["vServerWrite"]; this.columnjobtype = base.Columns["jobtype"]; this.columnbypasssid = base.Columns["bypasssid"]; + this.columnvWMSInfo = base.Columns["vWMSInfo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3357,6 +3369,8 @@ namespace Project { base.Columns.Add(this.columnjobtype); this.columnbypasssid = new global::System.Data.DataColumn("bypasssid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbypasssid); + this.columnvWMSInfo = new global::System.Data.DataColumn("vWMSInfo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnvWMSInfo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -3371,6 +3385,7 @@ namespace Project { this.columnRemark.MaxLength = 100; this.columnjobtype.MaxLength = 10; this.columnbypasssid.MaxLength = 255; + this.columnvWMSInfo.DefaultValue = ((int)(0)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6034,6 +6049,8 @@ namespace Project { private global::System.Data.DataColumn columnAutoOutConveyor; + private global::System.Data.DataColumn columnvWMSInfo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public OPModelDataTable() { @@ -6267,6 +6284,14 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn vWMSInfoColumn { + get { + return this.columnvWMSInfo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -6328,7 +6353,8 @@ namespace Project { bool bOwnZPL, bool IgnorePartNo, bool IgnoreBatch, - int AutoOutConveyor) { + int AutoOutConveyor, + ushort vWMSInfo) { OPModelRow rowOPModelRow = ((OPModelRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -6355,7 +6381,8 @@ namespace Project { bOwnZPL, IgnorePartNo, IgnoreBatch, - AutoOutConveyor}; + AutoOutConveyor, + vWMSInfo}; rowOPModelRow.ItemArray = columnValuesArray; this.Rows.Add(rowOPModelRow); return rowOPModelRow; @@ -6410,6 +6437,7 @@ namespace Project { this.columnIgnorePartNo = base.Columns["IgnorePartNo"]; this.columnIgnoreBatch = base.Columns["IgnoreBatch"]; this.columnAutoOutConveyor = base.Columns["AutoOutConveyor"]; + this.columnvWMSInfo = base.Columns["vWMSInfo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6465,12 +6493,15 @@ namespace Project { base.Columns.Add(this.columnIgnoreBatch); this.columnAutoOutConveyor = new global::System.Data.DataColumn("AutoOutConveyor", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnAutoOutConveyor); + this.columnvWMSInfo = new global::System.Data.DataColumn("vWMSInfo", typeof(ushort), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnvWMSInfo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; this.columnidx.AutoIncrementSeed = 1; this.columnidx.AllowDBNull = false; this.columnidx.Unique = true; + this.columnvWMSInfo.DefaultValue = ((ushort)(0)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11547,6 +11578,22 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int vWMSInfo { + get { + if (this.IsvWMSInfoNull()) { + return 0; + } + else { + return ((int)(this[this.tableK4EE_Component_Reel_PreSet.vWMSInfoColumn])); + } + } + set { + this[this.tableK4EE_Component_Reel_PreSet.vWMSInfoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsMCNull() { @@ -11654,6 +11701,18 @@ namespace Project { public void SetbypasssidNull() { this[this.tableK4EE_Component_Reel_PreSet.bypasssidColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsvWMSInfoNull() { + return this.IsNull(this.tableK4EE_Component_Reel_PreSet.vWMSInfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetvWMSInfoNull() { + this[this.tableK4EE_Component_Reel_PreSet.vWMSInfoColumn] = global::System.Convert.DBNull; + } } /// @@ -13006,6 +13065,22 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public ushort vWMSInfo { + get { + if (this.IsvWMSInfoNull()) { + return 0; + } + else { + return ((ushort)(this[this.tableOPModel.vWMSInfoColumn])); + } + } + set { + this[this.tableOPModel.vWMSInfoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsMidxNull() { @@ -13293,6 +13368,18 @@ namespace Project { public void SetAutoOutConveyorNull() { this[this.tableOPModel.AutoOutConveyorColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsvWMSInfoNull() { + return this.IsNull(this.tableOPModel.vWMSInfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetvWMSInfoNull() { + this[this.tableOPModel.vWMSInfoColumn] = global::System.Convert.DBNull; + } } /// @@ -19492,82 +19579,89 @@ WHERE (MC = @mcname)"; tableMapping.ColumnMappings.Add("vServerWrite", "vServerWrite"); tableMapping.ColumnMappings.Add("jobtype", "jobtype"); tableMapping.ColumnMappings.Add("bypasssid", "bypasssid"); + tableMapping.ColumnMappings.Add("0", "vWMSInfo"); 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 [K4EE_Component_Reel_PreSet] WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [K4EE_Component_Reel_PreSet] WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid)) AND ((@IsNull_vWMSInfo = 1 AND [vWMSInfo] IS NULL) OR ([vWMSInfo] = @Original_vWMSInfo)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_MC", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Title", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Remark", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_wdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vOption", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vJobInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vSidInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vServerWrite", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobtype", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobtype", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bypasssid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bypasssid", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bypasssid", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [K4EE_Component_Reel_PreSet] ([MC], [Title], [Remark], [wdate], [vOption], [vJobInfo], [vSidInfo], [vServerWrite], [jobtype], [bypasssid]) VALUES (@MC, @Title, @Remark, @wdate, @vOption, @vJobInfo, @vSidInfo, @vServerWrite, @jobtype, @bypasssid); -SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid FROM Component_Reel_PreSet WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [K4EE_Component_Reel_PreSet] ([MC], [Title], [Remark], [wdate], [vOption], [vJobInfo], [vSidInfo], [vServerWrite], [jobtype], [bypasssid], [vWMSInfo]) VALUES (@MC, @Title, @Remark, @wdate, @vOption, @vJobInfo, @vSidInfo, @vServerWrite, @jobtype, @bypasssid, @vWMSInfo); +SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo FROM K4EE_Component_Reel_PreSet WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vOption", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vJobInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vSidInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vServerWrite", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bypasssid", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bypasssid", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", 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 [K4EE_Component_Reel_PreSet] SET [MC] = @MC, [Title] = @Title, [Remark] = @Remark, [wdate] = @wdate, [vOption] = @vOption, [vJobInfo] = @vJobInfo, [vSidInfo] = @vSidInfo, [vServerWrite] = @vServerWrite, [jobtype] = @jobtype, [bypasssid] = @bypasssid WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid))); -SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid FROM Component_Reel_PreSet WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [K4EE_Component_Reel_PreSet] SET [MC] = @MC, [Title] = @Title, [Remark] = @Remark, [wdate] = @wdate, [vOption] = @vOption, [vJobInfo] = @vJobInfo, [vSidInfo] = @vSidInfo, [vServerWrite] = @vServerWrite, [jobtype] = @jobtype, [bypasssid] = @bypasssid, [vWMSInfo] = @vWMSInfo WHERE (([idx] = @Original_idx) AND ((@IsNull_MC = 1 AND [MC] IS NULL) OR ([MC] = @Original_MC)) AND ([Title] = @Original_Title) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_vOption = 1 AND [vOption] IS NULL) OR ([vOption] = @Original_vOption)) AND ((@IsNull_vJobInfo = 1 AND [vJobInfo] IS NULL) OR ([vJobInfo] = @Original_vJobInfo)) AND ((@IsNull_vSidInfo = 1 AND [vSidInfo] IS NULL) OR ([vSidInfo] = @Original_vSidInfo)) AND ((@IsNull_vServerWrite = 1 AND [vServerWrite] IS NULL) OR ([vServerWrite] = @Original_vServerWrite)) AND ((@IsNull_jobtype = 1 AND [jobtype] IS NULL) OR ([jobtype] = @Original_jobtype)) AND ((@IsNull_bypasssid = 1 AND [bypasssid] IS NULL) OR ([bypasssid] = @Original_bypasssid)) AND ((@IsNull_vWMSInfo = 1 AND [vWMSInfo] IS NULL) OR ([vWMSInfo] = @Original_vWMSInfo))); +SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo FROM K4EE_Component_Reel_PreSet WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vOption", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vJobInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vSidInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vServerWrite", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bypasssid", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bypasssid", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_MC", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Title", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Remark", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_wdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vOption", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vOption", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vOption", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vJobInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vJobInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vJobInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vSidInfo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vSidInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vSidInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vServerWrite", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vServerWrite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vServerWrite", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobtype", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobtype", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobtype", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bypasssid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bypasssid", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bypasssid", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bypasssid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_vWMSInfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "vWMSInfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -19583,9 +19677,9 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, 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 idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite," + - " jobtype, bypasssid\r\nFROM K4EE_Component_Reel_PreSet\r\nWHERE (ISNULL(MC, \'\')" + - " = @mc)"; + this._commandCollection[0].CommandText = "SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServer" + + "Write, jobtype, bypasssid, vWMSInfo\r\nFROM K4EE_Component_Reel_PreSet\r" + + "\nWHERE (ISNULL(MC, \'\') = @mc)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mc", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -19659,7 +19753,7 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_MC, string Original_Title, string Original_Remark, global::System.Nullable Original_wdate, global::System.Nullable Original_vOption, global::System.Nullable Original_vJobInfo, global::System.Nullable Original_vSidInfo, global::System.Nullable Original_vServerWrite, string Original_jobtype, string Original_bypasssid) { + public virtual int Delete(int Original_idx, string Original_MC, string Original_Title, string Original_Remark, global::System.Nullable Original_wdate, global::System.Nullable Original_vOption, global::System.Nullable Original_vJobInfo, global::System.Nullable Original_vSidInfo, global::System.Nullable Original_vServerWrite, string Original_jobtype, string Original_bypasssid, global::System.Nullable Original_vWMSInfo) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_MC == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -19739,6 +19833,14 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[19].Value = ((string)(Original_bypasssid)); } + if ((Original_vWMSInfo.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[21].Value = ((int)(Original_vWMSInfo.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -19759,7 +19861,7 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string MC, string Title, string Remark, global::System.Nullable wdate, global::System.Nullable vOption, global::System.Nullable vJobInfo, global::System.Nullable vSidInfo, global::System.Nullable vServerWrite, string jobtype, string bypasssid) { + public virtual int Insert(string MC, string Title, string Remark, global::System.Nullable wdate, global::System.Nullable vOption, global::System.Nullable vJobInfo, global::System.Nullable vSidInfo, global::System.Nullable vServerWrite, string jobtype, string bypasssid, global::System.Nullable vWMSInfo) { if ((MC == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -19820,6 +19922,12 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, else { this.Adapter.InsertCommand.Parameters[9].Value = ((string)(bypasssid)); } + if ((vWMSInfo.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[10].Value = ((int)(vWMSInfo.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -19851,6 +19959,7 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, global::System.Nullable vServerWrite, string jobtype, string bypasssid, + global::System.Nullable vWMSInfo, int Original_idx, string Original_MC, string Original_Title, @@ -19862,7 +19971,8 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, global::System.Nullable Original_vServerWrite, string Original_jobtype, string Original_bypasssid, - object idx) { + global::System.Nullable Original_vWMSInfo, + int idx) { if ((MC == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -19923,91 +20033,100 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, else { this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(bypasssid)); } - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx)); - if ((Original_MC == null)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + if ((vWMSInfo.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(vWMSInfo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_MC)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx)); + if ((Original_MC == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_MC)); } if ((Original_Title == null)) { throw new global::System.ArgumentNullException("Original_Title"); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_Title)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_Title)); } if ((Original_Remark == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_Remark)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_Remark)); } if ((Original_wdate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(Original_wdate.Value)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((System.DateTime)(Original_wdate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } if ((Original_vOption.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_vOption.Value)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_vOption.Value)); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } if ((Original_vJobInfo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_vJobInfo.Value)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_vJobInfo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } if ((Original_vSidInfo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_vSidInfo.Value)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_vSidInfo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } if ((Original_vServerWrite.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_vServerWrite.Value)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_vServerWrite.Value)); } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } if ((Original_jobtype == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_jobtype)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_jobtype)); } if ((Original_bypasssid == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_bypasssid)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_bypasssid)); } - if ((idx == null)) { - throw new global::System.ArgumentNullException("idx"); + if ((Original_vWMSInfo.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_vWMSInfo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(idx)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -20023,6 +20142,37 @@ SELECT idx, MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, } } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] + public virtual int Update( + string MC, + string Title, + string Remark, + global::System.Nullable wdate, + global::System.Nullable vOption, + global::System.Nullable vJobInfo, + global::System.Nullable vSidInfo, + global::System.Nullable vServerWrite, + string jobtype, + string bypasssid, + global::System.Nullable vWMSInfo, + int Original_idx, + string Original_MC, + string Original_Title, + string Original_Remark, + global::System.Nullable Original_wdate, + global::System.Nullable Original_vOption, + global::System.Nullable Original_vJobInfo, + global::System.Nullable Original_vSidInfo, + global::System.Nullable Original_vServerWrite, + string Original_jobtype, + string Original_bypasssid, + global::System.Nullable Original_vWMSInfo) { + return this.Update(MC, Title, Remark, wdate, vOption, vJobInfo, vSidInfo, vServerWrite, jobtype, bypasssid, vWMSInfo, Original_idx, Original_MC, Original_Title, Original_Remark, Original_wdate, Original_vOption, Original_vJobInfo, Original_vSidInfo, Original_vServerWrite, Original_jobtype, Original_bypasssid, Original_vWMSInfo, Original_idx); + } } /// diff --git a/Handler/Project/Dialog/Model_Operation.Designer.cs b/Handler/Project/Dialog/Model_Operation.Designer.cs index f229475..3773b17 100644 --- a/Handler/Project/Dialog/Model_Operation.Designer.cs +++ b/Handler/Project/Dialog/Model_Operation.Designer.cs @@ -29,11 +29,11 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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 dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation)); this.dv = new arCtl.arDatagridView(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -63,6 +63,7 @@ this.button1 = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.chkApplyWMSInfo = new System.Windows.Forms.CheckBox(); this.chkApplySidInfo = new System.Windows.Forms.CheckBox(); this.chkApplyJobInfo = new System.Windows.Forms.CheckBox(); this.chkApplySIDConvData = new System.Windows.Forms.CheckBox(); @@ -100,7 +101,6 @@ this.checkBox5 = new System.Windows.Forms.CheckBox(); this.checkBox4 = new System.Windows.Forms.CheckBox(); this.grpApplySidinfo = new System.Windows.Forms.GroupBox(); - this.checkBox33 = new System.Windows.Forms.CheckBox(); this.checkBox28 = new System.Windows.Forms.CheckBox(); this.checkBox26 = new System.Windows.Forms.CheckBox(); this.checkBox27 = new System.Windows.Forms.CheckBox(); @@ -115,6 +115,18 @@ this.checkBox15 = new System.Windows.Forms.CheckBox(); this.checkBox16 = new System.Windows.Forms.CheckBox(); this.checkBox17 = new System.Windows.Forms.CheckBox(); + this.grpApplyWMSinfo = new System.Windows.Forms.GroupBox(); + this.checkBox36 = new System.Windows.Forms.CheckBox(); + this.checkBox38 = new System.Windows.Forms.CheckBox(); + this.label22 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.checkBox41 = new System.Windows.Forms.CheckBox(); + this.checkBox42 = new System.Windows.Forms.CheckBox(); + this.checkBox43 = new System.Windows.Forms.CheckBox(); + this.checkBox44 = new System.Windows.Forms.CheckBox(); + this.checkBox45 = new System.Windows.Forms.CheckBox(); + this.checkBox46 = new System.Windows.Forms.CheckBox(); + this.checkBox47 = new System.Windows.Forms.CheckBox(); this.panel6 = new System.Windows.Forms.Panel(); this.tbDefDate = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); @@ -161,6 +173,7 @@ this.GrpSidConvData.SuspendLayout(); this.grpapplyjob.SuspendLayout(); this.grpApplySidinfo.SuspendLayout(); + this.grpApplyWMSinfo.SuspendLayout(); this.panel6.SuspendLayout(); this.panel2.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -188,22 +201,22 @@ this.Code, this.dvc_bsave}); this.dv.DataSource = this.bs; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(5); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle20.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(5); + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv.DefaultCellStyle = dataGridViewCellStyle20; this.dv.Dock = System.Windows.Forms.DockStyle.Fill; this.dv.Location = new System.Drawing.Point(0, 136); this.dv.MultiSelect = false; this.dv.Name = "dv"; this.dv.RowHeadersVisible = false; this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dv.Size = new System.Drawing.Size(639, 473); + this.dv.Size = new System.Drawing.Size(639, 555); this.dv.TabIndex = 1; this.dv.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv_DataError); // @@ -211,8 +224,8 @@ // this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; this.Column1.DataPropertyName = "idx"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column1.DefaultCellStyle = dataGridViewCellStyle16; this.Column1.HeaderText = "*"; this.Column1.Name = "Column1"; this.Column1.Width = 50; @@ -221,8 +234,8 @@ // this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dvc_title.DataPropertyName = "Title"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_title.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_title.DefaultCellStyle = dataGridViewCellStyle17; this.dvc_title.HeaderText = "Description"; this.dvc_title.Name = "dvc_title"; // @@ -230,16 +243,16 @@ // this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.Code.DataPropertyName = "Code"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Code.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Code.DefaultCellStyle = dataGridViewCellStyle18; this.Code.HeaderText = "Customer Code"; this.Code.Name = "Code"; // // dvc_bsave // this.dvc_bsave.DataPropertyName = "BSave"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle19; this.dvc_bsave.HeaderText = "BLoad"; this.dvc_bsave.Name = "dvc_bsave"; this.dvc_bsave.Width = 86; @@ -294,7 +307,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(1, 1); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1368, 737); + this.panel5.Size = new System.Drawing.Size(1368, 819); this.panel5.TabIndex = 3; // // panel4 @@ -308,7 +321,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(0, 53); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1368, 684); + this.panel4.Size = new System.Drawing.Size(1368, 766); this.panel4.TabIndex = 3; // // panel1 @@ -323,7 +336,7 @@ this.panel1.Location = new System.Drawing.Point(639, 136); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(10); - this.panel1.Size = new System.Drawing.Size(729, 473); + this.panel1.Size = new System.Drawing.Size(729, 555); this.panel1.TabIndex = 28; // // panel8 @@ -502,11 +515,12 @@ this.tabControl1.Location = new System.Drawing.Point(10, 169); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(709, 294); + this.tabControl1.Size = new System.Drawing.Size(709, 376); this.tabControl1.TabIndex = 27; // // tabPage1 // + this.tabPage1.Controls.Add(this.chkApplyWMSInfo); this.tabPage1.Controls.Add(this.chkApplySidInfo); this.tabPage1.Controls.Add(this.chkApplyJobInfo); this.tabPage1.Controls.Add(this.chkApplySIDConvData); @@ -518,17 +532,31 @@ this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(10); - this.tabPage1.Size = new System.Drawing.Size(701, 264); + this.tabPage1.Size = new System.Drawing.Size(701, 346); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Options"; this.tabPage1.UseVisualStyleBackColor = true; // + // chkApplyWMSInfo + // + this.chkApplyWMSInfo.AutoSize = true; + this.chkApplyWMSInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.chkApplyWMSInfo.ForeColor = System.Drawing.Color.Gray; + this.chkApplyWMSInfo.Location = new System.Drawing.Point(13, 298); + this.chkApplyWMSInfo.Name = "chkApplyWMSInfo"; + this.chkApplyWMSInfo.Size = new System.Drawing.Size(446, 25); + this.chkApplyWMSInfo.TabIndex = 34; + this.chkApplyWMSInfo.Tag = "8"; + this.chkApplyWMSInfo.Text = "Automatically record data using WMS information table"; + this.chkApplyWMSInfo.UseVisualStyleBackColor = true; + this.chkApplyWMSInfo.CheckStateChanged += new System.EventHandler(this.chkApplySidInfo_CheckStateChanged); + // // chkApplySidInfo // this.chkApplySidInfo.AutoSize = true; this.chkApplySidInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplySidInfo.ForeColor = System.Drawing.Color.Gray; - this.chkApplySidInfo.Location = new System.Drawing.Point(13, 202); + this.chkApplySidInfo.Location = new System.Drawing.Point(13, 226); this.chkApplySidInfo.Name = "chkApplySidInfo"; this.chkApplySidInfo.Size = new System.Drawing.Size(431, 25); this.chkApplySidInfo.TabIndex = 33; @@ -542,7 +570,7 @@ this.chkApplyJobInfo.AutoSize = true; this.chkApplyJobInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplyJobInfo.ForeColor = System.Drawing.Color.Gray; - this.chkApplyJobInfo.Location = new System.Drawing.Point(13, 170); + this.chkApplyJobInfo.Location = new System.Drawing.Point(13, 190); this.chkApplyJobInfo.Name = "chkApplyJobInfo"; this.chkApplyJobInfo.Size = new System.Drawing.Size(424, 25); this.chkApplyJobInfo.TabIndex = 32; @@ -556,7 +584,7 @@ this.chkApplySIDConvData.AutoSize = true; this.chkApplySIDConvData.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplySIDConvData.ForeColor = System.Drawing.Color.Gray; - this.chkApplySIDConvData.Location = new System.Drawing.Point(13, 234); + this.chkApplySIDConvData.Location = new System.Drawing.Point(13, 262); this.chkApplySIDConvData.Name = "chkApplySIDConvData"; this.chkApplySIDConvData.Size = new System.Drawing.Size(426, 25); this.chkApplySIDConvData.TabIndex = 31; @@ -572,10 +600,10 @@ this.chkUserConfirm.ForeColor = System.Drawing.Color.Gray; this.chkUserConfirm.Location = new System.Drawing.Point(13, 11); this.chkUserConfirm.Name = "chkUserConfirm"; - this.chkUserConfirm.Size = new System.Drawing.Size(444, 25); + this.chkUserConfirm.Size = new System.Drawing.Size(316, 25); this.chkUserConfirm.TabIndex = 13; this.chkUserConfirm.Tag = "0"; - this.chkUserConfirm.Text = "User confirms final print values (no automatic progress)"; + this.chkUserConfirm.Text = "User confirms (no automatic progress)"; this.chkUserConfirm.UseVisualStyleBackColor = true; this.chkUserConfirm.CheckStateChanged += new System.EventHandler(this.chkApplySidInfo_CheckStateChanged); // @@ -584,7 +612,7 @@ this.chkSIDConv.AutoSize = true; this.chkSIDConv.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkSIDConv.ForeColor = System.Drawing.Color.Gray; - this.chkSIDConv.Location = new System.Drawing.Point(13, 138); + this.chkSIDConv.Location = new System.Drawing.Point(13, 154); this.chkSIDConv.Name = "chkSIDConv"; this.chkSIDConv.Size = new System.Drawing.Size(372, 25); this.chkSIDConv.TabIndex = 28; @@ -598,12 +626,12 @@ this.chkQtyServer.AutoSize = true; this.chkQtyServer.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkQtyServer.ForeColor = System.Drawing.Color.Gray; - this.chkQtyServer.Location = new System.Drawing.Point(13, 43); + this.chkQtyServer.Location = new System.Drawing.Point(13, 47); this.chkQtyServer.Name = "chkQtyServer"; - this.chkQtyServer.Size = new System.Drawing.Size(388, 25); + this.chkQtyServer.Size = new System.Drawing.Size(307, 25); this.chkQtyServer.TabIndex = 13; this.chkQtyServer.Tag = "1"; - this.chkQtyServer.Text = "Query and use server quantity based on Reel ID"; + this.chkQtyServer.Text = "Use server quantity based on Reel ID"; this.chkQtyServer.UseVisualStyleBackColor = true; this.chkQtyServer.CheckStateChanged += new System.EventHandler(this.chkApplySidInfo_CheckStateChanged); // @@ -612,7 +640,7 @@ this.chkQtyMRQ.AutoSize = true; this.chkQtyMRQ.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkQtyMRQ.ForeColor = System.Drawing.Color.Gray; - this.chkQtyMRQ.Location = new System.Drawing.Point(13, 106); + this.chkQtyMRQ.Location = new System.Drawing.Point(13, 118); this.chkQtyMRQ.Name = "chkQtyMRQ"; this.chkQtyMRQ.Size = new System.Drawing.Size(453, 25); this.chkQtyMRQ.TabIndex = 27; @@ -626,7 +654,7 @@ this.chkNew.AutoSize = true; this.chkNew.Font = new System.Drawing.Font("맑은 고딕", 11F); this.chkNew.ForeColor = System.Drawing.Color.Gray; - this.chkNew.Location = new System.Drawing.Point(13, 75); + this.chkNew.Location = new System.Drawing.Point(13, 83); this.chkNew.Name = "chkNew"; this.chkNew.Size = new System.Drawing.Size(159, 24); this.chkNew.TabIndex = 24; @@ -640,10 +668,11 @@ this.tabPage2.Controls.Add(this.GrpSidConvData); this.tabPage2.Controls.Add(this.grpapplyjob); this.tabPage2.Controls.Add(this.grpApplySidinfo); + this.tabPage2.Controls.Add(this.grpApplyWMSinfo); this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(10); - this.tabPage2.Size = new System.Drawing.Size(701, 264); + this.tabPage2.Size = new System.Drawing.Size(701, 346); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Option Data"; this.tabPage2.UseVisualStyleBackColor = true; @@ -666,7 +695,7 @@ this.GrpSidConvData.Controls.Add(this.checkBox25); this.GrpSidConvData.Dock = System.Windows.Forms.DockStyle.Top; this.GrpSidConvData.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.GrpSidConvData.Location = new System.Drawing.Point(10, 174); + this.GrpSidConvData.Location = new System.Drawing.Point(10, 256); this.GrpSidConvData.Name = "GrpSidConvData"; this.GrpSidConvData.Size = new System.Drawing.Size(681, 82); this.GrpSidConvData.TabIndex = 34; @@ -851,7 +880,7 @@ this.grpapplyjob.Dock = System.Windows.Forms.DockStyle.Top; this.grpapplyjob.Enabled = false; this.grpapplyjob.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.grpapplyjob.Location = new System.Drawing.Point(10, 92); + this.grpapplyjob.Location = new System.Drawing.Point(10, 174); this.grpapplyjob.Name = "grpapplyjob"; this.grpapplyjob.Size = new System.Drawing.Size(681, 82); this.grpapplyjob.TabIndex = 33; @@ -985,7 +1014,6 @@ // // grpApplySidinfo // - this.grpApplySidinfo.Controls.Add(this.checkBox33); this.grpApplySidinfo.Controls.Add(this.checkBox28); this.grpApplySidinfo.Controls.Add(this.checkBox26); this.grpApplySidinfo.Controls.Add(this.checkBox27); @@ -1003,25 +1031,13 @@ this.grpApplySidinfo.Dock = System.Windows.Forms.DockStyle.Top; this.grpApplySidinfo.Enabled = false; this.grpApplySidinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.grpApplySidinfo.Location = new System.Drawing.Point(10, 10); + this.grpApplySidinfo.Location = new System.Drawing.Point(10, 92); this.grpApplySidinfo.Name = "grpApplySidinfo"; this.grpApplySidinfo.Size = new System.Drawing.Size(681, 82); this.grpApplySidinfo.TabIndex = 33; this.grpApplySidinfo.TabStop = false; this.grpApplySidinfo.Text = "SID Information Application"; // - // checkBox33 - // - this.checkBox33.AutoSize = true; - this.checkBox33.ForeColor = System.Drawing.Color.Blue; - this.checkBox33.Location = new System.Drawing.Point(379, 50); - this.checkBox33.Name = "checkBox33"; - this.checkBox33.Size = new System.Drawing.Size(50, 23); - this.checkBox33.TabIndex = 38; - this.checkBox33.Tag = "12"; - this.checkBox33.Text = "MC"; - this.checkBox33.UseVisualStyleBackColor = true; - // // checkBox28 // this.checkBox28.AutoSize = true; @@ -1184,6 +1200,155 @@ this.checkBox17.Text = "Part No"; this.checkBox17.UseVisualStyleBackColor = true; // + // grpApplyWMSinfo + // + this.grpApplyWMSinfo.Controls.Add(this.checkBox36); + this.grpApplyWMSinfo.Controls.Add(this.checkBox38); + this.grpApplyWMSinfo.Controls.Add(this.label22); + this.grpApplyWMSinfo.Controls.Add(this.label23); + this.grpApplyWMSinfo.Controls.Add(this.checkBox41); + this.grpApplyWMSinfo.Controls.Add(this.checkBox42); + this.grpApplyWMSinfo.Controls.Add(this.checkBox43); + this.grpApplyWMSinfo.Controls.Add(this.checkBox44); + this.grpApplyWMSinfo.Controls.Add(this.checkBox45); + this.grpApplyWMSinfo.Controls.Add(this.checkBox46); + this.grpApplyWMSinfo.Controls.Add(this.checkBox47); + this.grpApplyWMSinfo.Dock = System.Windows.Forms.DockStyle.Top; + this.grpApplyWMSinfo.Enabled = false; + this.grpApplyWMSinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.grpApplyWMSinfo.Location = new System.Drawing.Point(10, 10); + this.grpApplyWMSinfo.Name = "grpApplyWMSinfo"; + this.grpApplyWMSinfo.Size = new System.Drawing.Size(681, 82); + this.grpApplyWMSinfo.TabIndex = 35; + this.grpApplyWMSinfo.TabStop = false; + this.grpApplyWMSinfo.Text = "WMS Information Application"; + // + // checkBox36 + // + this.checkBox36.AutoSize = true; + this.checkBox36.ForeColor = System.Drawing.Color.Blue; + this.checkBox36.Location = new System.Drawing.Point(311, 51); + this.checkBox36.Name = "checkBox36"; + this.checkBox36.Size = new System.Drawing.Size(62, 23); + this.checkBox36.TabIndex = 37; + this.checkBox36.Tag = "11"; + this.checkBox36.Text = "VLOT"; + this.checkBox36.UseVisualStyleBackColor = true; + // + // checkBox38 + // + this.checkBox38.AutoSize = true; + this.checkBox38.ForeColor = System.Drawing.Color.Green; + this.checkBox38.Location = new System.Drawing.Point(431, 24); + this.checkBox38.Name = "checkBox38"; + this.checkBox38.Size = new System.Drawing.Size(63, 23); + this.checkBox38.TabIndex = 35; + this.checkBox38.Tag = "9"; + this.checkBox38.Text = "Batch"; + this.checkBox38.UseVisualStyleBackColor = true; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label22.Location = new System.Drawing.Point(6, 54); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(41, 15); + this.label22.TabIndex = 29; + this.label22.Text = "Query"; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label23.Location = new System.Drawing.Point(7, 28); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(40, 15); + this.label23.TabIndex = 29; + this.label23.Text = "Apply"; + // + // checkBox41 + // + this.checkBox41.AutoSize = true; + this.checkBox41.Location = new System.Drawing.Point(311, 24); + this.checkBox41.Name = "checkBox41"; + this.checkBox41.Size = new System.Drawing.Size(114, 23); + this.checkBox41.TabIndex = 28; + this.checkBox41.Tag = "3"; + this.checkBox41.Text = "Vender Name"; + this.checkBox41.UseVisualStyleBackColor = true; + // + // checkBox42 + // + this.checkBox42.AutoSize = true; + this.checkBox42.ForeColor = System.Drawing.Color.Blue; + this.checkBox42.Location = new System.Drawing.Point(255, 50); + this.checkBox42.Name = "checkBox42"; + this.checkBox42.Size = new System.Drawing.Size(50, 23); + this.checkBox42.TabIndex = 27; + this.checkBox42.Tag = "7"; + this.checkBox42.Text = "SID"; + this.checkBox42.UseVisualStyleBackColor = true; + // + // checkBox43 + // + this.checkBox43.AutoSize = true; + this.checkBox43.ForeColor = System.Drawing.Color.Blue; + this.checkBox43.Location = new System.Drawing.Point(156, 50); + this.checkBox43.Name = "checkBox43"; + this.checkBox43.Size = new System.Drawing.Size(93, 23); + this.checkBox43.TabIndex = 25; + this.checkBox43.Tag = "6"; + this.checkBox43.Text = "Cust Code"; + this.checkBox43.UseVisualStyleBackColor = true; + // + // checkBox44 + // + this.checkBox44.AutoSize = true; + this.checkBox44.ForeColor = System.Drawing.Color.Blue; + this.checkBox44.Location = new System.Drawing.Point(73, 50); + this.checkBox44.Name = "checkBox44"; + this.checkBox44.Size = new System.Drawing.Size(77, 23); + this.checkBox44.TabIndex = 25; + this.checkBox44.Tag = "5"; + this.checkBox44.Text = "Part No"; + this.checkBox44.UseVisualStyleBackColor = true; + // + // checkBox45 + // + this.checkBox45.AutoSize = true; + this.checkBox45.Location = new System.Drawing.Point(255, 24); + this.checkBox45.Name = "checkBox45"; + this.checkBox45.Size = new System.Drawing.Size(50, 23); + this.checkBox45.TabIndex = 26; + this.checkBox45.Tag = "2"; + this.checkBox45.Text = "SID"; + this.checkBox45.UseVisualStyleBackColor = true; + // + // checkBox46 + // + this.checkBox46.AutoSize = true; + this.checkBox46.Location = new System.Drawing.Point(156, 24); + this.checkBox46.Name = "checkBox46"; + this.checkBox46.Size = new System.Drawing.Size(93, 23); + this.checkBox46.TabIndex = 25; + this.checkBox46.Tag = "1"; + this.checkBox46.Text = "Cust Code"; + this.checkBox46.UseVisualStyleBackColor = true; + // + // checkBox47 + // + this.checkBox47.AutoSize = true; + this.checkBox47.Location = new System.Drawing.Point(73, 24); + this.checkBox47.Name = "checkBox47"; + this.checkBox47.Size = new System.Drawing.Size(77, 23); + this.checkBox47.TabIndex = 25; + this.checkBox47.Tag = "0"; + this.checkBox47.Text = "Part No"; + this.checkBox47.UseVisualStyleBackColor = true; + // // panel6 // this.panel6.BackColor = System.Drawing.Color.Gainsboro; @@ -1372,7 +1537,7 @@ this.panel3.Controls.Add(this.label8); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel3.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panel3.Location = new System.Drawing.Point(0, 609); + this.panel3.Location = new System.Drawing.Point(0, 691); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(1368, 20); this.panel3.TabIndex = 29; @@ -1481,7 +1646,7 @@ this.btCopy, this.toolStripButton10, this.toolStripSeparator1}); - this.toolStrip1.Location = new System.Drawing.Point(0, 629); + this.toolStrip1.Location = new System.Drawing.Point(0, 711); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1368, 55); this.toolStrip1.TabIndex = 8; @@ -1634,7 +1799,7 @@ // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1370, 739); + this.ClientSize = new System.Drawing.Size(1370, 821); this.Controls.Add(this.panel5); this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -1664,6 +1829,8 @@ this.grpapplyjob.PerformLayout(); this.grpApplySidinfo.ResumeLayout(false); this.grpApplySidinfo.PerformLayout(); + this.grpApplyWMSinfo.ResumeLayout(false); + this.grpApplyWMSinfo.PerformLayout(); this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); this.panel2.ResumeLayout(false); @@ -1773,7 +1940,6 @@ private System.Windows.Forms.CheckBox chkEnbCamera; private System.Windows.Forms.CheckBox checkBox32; private System.Windows.Forms.CheckBox chkSIDCHK; - private System.Windows.Forms.CheckBox checkBox33; private System.Windows.Forms.CheckBox checkBox34; private System.Windows.Forms.CheckBox checkBox35; private System.Windows.Forms.CheckBox chkSave2; @@ -1790,5 +1956,18 @@ private System.Windows.Forms.Label label21; private System.Windows.Forms.TextBox tbAutoOutSec; private System.Windows.Forms.Label label20; + private System.Windows.Forms.CheckBox chkApplyWMSInfo; + private System.Windows.Forms.GroupBox grpApplyWMSinfo; + private System.Windows.Forms.CheckBox checkBox36; + private System.Windows.Forms.CheckBox checkBox38; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.CheckBox checkBox41; + private System.Windows.Forms.CheckBox checkBox42; + private System.Windows.Forms.CheckBox checkBox43; + private System.Windows.Forms.CheckBox checkBox44; + private System.Windows.Forms.CheckBox checkBox45; + private System.Windows.Forms.CheckBox checkBox46; + private System.Windows.Forms.CheckBox checkBox47; } } \ No newline at end of file diff --git a/Handler/Project/Dialog/Model_Operation.cs b/Handler/Project/Dialog/Model_Operation.cs index 9963cc7..9dc2df2 100644 --- a/Handler/Project/Dialog/Model_Operation.cs +++ b/Handler/Project/Dialog/Model_Operation.cs @@ -120,6 +120,13 @@ namespace Project if (chk.Tag == null) continue; chk.Click += Chk_Option_Check; } + foreach (var c in grpApplyWMSinfo.Controls) + { + if (c.GetType() != typeof(CheckBox)) continue; + var chk = c as CheckBox; + if (chk.Tag == null) continue; + chk.Click += Chk_WMSinfo_Check; + } foreach (var c in grpApplySidinfo.Controls) { if (c.GetType() != typeof(CheckBox)) continue; @@ -154,6 +161,17 @@ namespace Project bs_CurrentChanged_1(null, null); } + private void Chk_WMSinfo_Check(object sender, EventArgs e) + { + var drv = bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DataSet1.OPModelRow; + var chk = sender as CheckBox; + dr.vWMSInfo = UTIL.SetBitState(dr.vWMSInfo, int.Parse(chk.Tag.ToString()), chk.Checked); + dr.EndEdit(); + + bs_CurrentChanged_1(null, null); + } private void Chk_Sidinfo_Check(object sender, EventArgs e) { var drv = bs.Current as DataRowView; @@ -427,6 +445,14 @@ namespace Project var val = UTIL.GetBitState(dr.vOption, int.Parse(chk.Tag.ToString())); if (chk.Checked != val) chk.Checked = val; } + foreach (var c in grpApplyWMSinfo.Controls) + { + if (c.GetType() != typeof(CheckBox)) continue; + var chk = c as CheckBox; + if (chk.Tag == null) continue; + var val = UTIL.GetBitState(dr.vWMSInfo, int.Parse(chk.Tag.ToString())); + if (chk.Checked != val) chk.Checked = val; + } foreach (var c in grpApplySidinfo.Controls) { if (c.GetType() != typeof(CheckBox)) continue; @@ -515,6 +541,10 @@ namespace Project { grpapplyjob.Enabled = chk.Checked; } + if (chk.Name.Equals(chkApplyWMSInfo.Name)) + { + grpApplyWMSinfo.Enabled = chk.Checked; + } if (chk.Name.Equals(chkApplySidInfo.Name)) { grpApplySidinfo.Enabled = chk.Checked; @@ -523,6 +553,7 @@ namespace Project { GrpSidConvData.Enabled = chk.Checked; } + } private void btConvOk_Click(object sender, EventArgs e) diff --git a/Handler/Project/Dialog/Model_Operation.resx b/Handler/Project/Dialog/Model_Operation.resx index 2ad38ae..515e116 100644 --- a/Handler/Project/Dialog/Model_Operation.resx +++ b/Handler/Project/Dialog/Model_Operation.resx @@ -132,6 +132,9 @@ 17, 17 + + 17, 17 + 88, 17 diff --git a/Handler/Project/Dialog/fSelectJob.Designer.cs b/Handler/Project/Dialog/fSelectJob.Designer.cs index 79fb027..14df27d 100644 --- a/Handler/Project/Dialog/fSelectJob.Designer.cs +++ b/Handler/Project/Dialog/fSelectJob.Designer.cs @@ -97,6 +97,19 @@ this.btCancle = new arCtl.arLabel(); this.dataSet11 = new Project.DataSet1(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.chkApplyWMSInfo = new System.Windows.Forms.CheckBox(); + this.grpApplyWMSinfo = new System.Windows.Forms.GroupBox(); + this.checkBox36 = new System.Windows.Forms.CheckBox(); + this.chkWMSApplyBatch = new System.Windows.Forms.CheckBox(); + this.label22 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.checkBox41 = new System.Windows.Forms.CheckBox(); + this.checkBox42 = new System.Windows.Forms.CheckBox(); + this.checkBox43 = new System.Windows.Forms.CheckBox(); + this.checkBox44 = new System.Windows.Forms.CheckBox(); + this.checkBox45 = new System.Windows.Forms.CheckBox(); + this.checkBox46 = new System.Windows.Forms.CheckBox(); + this.checkBox47 = new System.Windows.Forms.CheckBox(); this.panel2.SuspendLayout(); this.panel5.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -108,6 +121,7 @@ this.tabPage3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataSet11)).BeginInit(); + this.grpApplyWMSinfo.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -123,7 +137,7 @@ this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; this.panel2.Padding = new System.Windows.Forms.Padding(9, 5, 9, 7); - this.panel2.Size = new System.Drawing.Size(751, 701); + this.panel2.Size = new System.Drawing.Size(751, 761); this.panel2.TabIndex = 136; // // panel5 @@ -133,7 +147,7 @@ this.panel5.Controls.Add(this.panel1); this.panel5.Controls.Add(this.button1); this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(9, 224); + this.panel5.Location = new System.Drawing.Point(9, 200); this.panel5.Name = "panel5"; this.panel5.Padding = new System.Windows.Forms.Padding(5); this.panel5.Size = new System.Drawing.Size(733, 73); @@ -173,7 +187,7 @@ // progressBar1 // this.progressBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.progressBar1.Location = new System.Drawing.Point(9, 214); + this.progressBar1.Location = new System.Drawing.Point(9, 190); this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(733, 10); this.progressBar1.TabIndex = 27; @@ -183,7 +197,7 @@ this.label1.BackColor = System.Drawing.Color.SkyBlue; this.label1.Dock = System.Windows.Forms.DockStyle.Top; this.label1.Font = new System.Drawing.Font("Consolas", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(9, 164); + this.label1.Location = new System.Drawing.Point(9, 140); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(733, 50); this.label1.TabIndex = 17; @@ -207,7 +221,7 @@ this.lbMsgCamoff.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.lbMsgCamoff.GradientRepeatBG = false; this.lbMsgCamoff.isButton = false; - this.lbMsgCamoff.Location = new System.Drawing.Point(9, 115); + this.lbMsgCamoff.Location = new System.Drawing.Point(9, 91); this.lbMsgCamoff.MouseDownColor = System.Drawing.Color.Yellow; this.lbMsgCamoff.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.lbMsgCamoff.msg = null; @@ -246,7 +260,7 @@ this.lbTitle.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.lbTitle.Cursor = System.Windows.Forms.Cursors.Arrow; this.lbTitle.Dock = System.Windows.Forms.DockStyle.Top; - this.lbTitle.Font = new System.Drawing.Font("맑은 고딕", 35F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbTitle.Font = new System.Drawing.Font("맑은 고딕", 30F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbTitle.ForeColor = System.Drawing.Color.DarkCyan; this.lbTitle.GradientEnable = true; this.lbTitle.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; @@ -273,7 +287,7 @@ this.lbTitle.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.lbTitle.SignColor = System.Drawing.Color.Yellow; this.lbTitle.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.lbTitle.Size = new System.Drawing.Size(733, 110); + this.lbTitle.Size = new System.Drawing.Size(733, 86); this.lbTitle.TabIndex = 60; this.lbTitle.Text = "Please select work method"; this.lbTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -288,14 +302,15 @@ this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Bottom; this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tabControl1.Location = new System.Drawing.Point(9, 297); + this.tabControl1.Location = new System.Drawing.Point(9, 278); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(733, 296); + this.tabControl1.Size = new System.Drawing.Size(733, 375); this.tabControl1.TabIndex = 26; // // tabPage1 // + this.tabPage1.Controls.Add(this.chkApplyWMSInfo); this.tabPage1.Controls.Add(this.chkApplySidInfo); this.tabPage1.Controls.Add(this.chkApplyJobInfo); this.tabPage1.Controls.Add(this.chkApplySIDConv); @@ -307,7 +322,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(10); - this.tabPage1.Size = new System.Drawing.Size(725, 266); + this.tabPage1.Size = new System.Drawing.Size(725, 345); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Options"; this.tabPage1.UseVisualStyleBackColor = true; @@ -317,9 +332,9 @@ this.chkApplySidInfo.AutoSize = true; this.chkApplySidInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplySidInfo.ForeColor = System.Drawing.Color.Gray; - this.chkApplySidInfo.Location = new System.Drawing.Point(13, 199); + this.chkApplySidInfo.Location = new System.Drawing.Point(13, 229); this.chkApplySidInfo.Name = "chkApplySidInfo"; - this.chkApplySidInfo.Size = new System.Drawing.Size(423, 25); + this.chkApplySidInfo.Size = new System.Drawing.Size(435, 25); this.chkApplySidInfo.TabIndex = 33; this.chkApplySidInfo.Tag = "6"; this.chkApplySidInfo.Text = "Automatically record data using SID information table."; @@ -331,9 +346,9 @@ this.chkApplyJobInfo.AutoSize = true; this.chkApplyJobInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplyJobInfo.ForeColor = System.Drawing.Color.Gray; - this.chkApplyJobInfo.Location = new System.Drawing.Point(13, 167); + this.chkApplyJobInfo.Location = new System.Drawing.Point(13, 192); this.chkApplyJobInfo.Name = "chkApplyJobInfo"; - this.chkApplyJobInfo.Size = new System.Drawing.Size(427, 25); + this.chkApplyJobInfo.Size = new System.Drawing.Size(409, 25); this.chkApplyJobInfo.TabIndex = 32; this.chkApplyJobInfo.Tag = "5"; this.chkApplyJobInfo.Text = "Automatically record data using daily work history."; @@ -345,9 +360,9 @@ this.chkApplySIDConv.AutoSize = true; this.chkApplySIDConv.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkApplySIDConv.ForeColor = System.Drawing.Color.Gray; - this.chkApplySIDConv.Location = new System.Drawing.Point(13, 231); + this.chkApplySIDConv.Location = new System.Drawing.Point(13, 266); this.chkApplySIDConv.Name = "chkApplySIDConv"; - this.chkApplySIDConv.Size = new System.Drawing.Size(425, 25); + this.chkApplySIDConv.Size = new System.Drawing.Size(426, 25); this.chkApplySIDConv.TabIndex = 31; this.chkApplySIDConv.Tag = "7"; this.chkApplySIDConv.Text = "Automatically record data using SID conversion table"; @@ -361,10 +376,10 @@ this.chkUserConfirm.ForeColor = System.Drawing.Color.Gray; this.chkUserConfirm.Location = new System.Drawing.Point(13, 8); this.chkUserConfirm.Name = "chkUserConfirm"; - this.chkUserConfirm.Size = new System.Drawing.Size(435, 25); + this.chkUserConfirm.Size = new System.Drawing.Size(316, 25); this.chkUserConfirm.TabIndex = 13; this.chkUserConfirm.Tag = "0"; - this.chkUserConfirm.Text = "User confirms final print values (no automatic progress)"; + this.chkUserConfirm.Text = "User confirms (no automatic progress)"; this.chkUserConfirm.UseVisualStyleBackColor = true; this.chkUserConfirm.CheckStateChanged += new System.EventHandler(this.checkBox1_CheckStateChanged); // @@ -373,9 +388,9 @@ this.chkSIDConv.AutoSize = true; this.chkSIDConv.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkSIDConv.ForeColor = System.Drawing.Color.Gray; - this.chkSIDConv.Location = new System.Drawing.Point(13, 135); + this.chkSIDConv.Location = new System.Drawing.Point(13, 155); this.chkSIDConv.Name = "chkSIDConv"; - this.chkSIDConv.Size = new System.Drawing.Size(413, 25); + this.chkSIDConv.Size = new System.Drawing.Size(376, 25); this.chkSIDConv.TabIndex = 28; this.chkSIDConv.Tag = "4"; this.chkSIDConv.Text = "Convert SID values using SID conversion table."; @@ -387,12 +402,12 @@ this.chkQtyServer.AutoSize = true; this.chkQtyServer.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkQtyServer.ForeColor = System.Drawing.Color.Gray; - this.chkQtyServer.Location = new System.Drawing.Point(13, 40); + this.chkQtyServer.Location = new System.Drawing.Point(13, 45); this.chkQtyServer.Name = "chkQtyServer"; - this.chkQtyServer.Size = new System.Drawing.Size(448, 25); + this.chkQtyServer.Size = new System.Drawing.Size(307, 25); this.chkQtyServer.TabIndex = 13; this.chkQtyServer.Tag = "1"; - this.chkQtyServer.Text = "Query and use server quantities based on Reel ID."; + this.chkQtyServer.Text = "Use server quantity based on Reel ID"; this.chkQtyServer.UseVisualStyleBackColor = true; this.chkQtyServer.CheckStateChanged += new System.EventHandler(this.checkBox1_CheckStateChanged); // @@ -401,9 +416,9 @@ this.chkQtyMRQ.AutoSize = true; this.chkQtyMRQ.Font = new System.Drawing.Font("맑은 고딕", 12F); this.chkQtyMRQ.ForeColor = System.Drawing.Color.Gray; - this.chkQtyMRQ.Location = new System.Drawing.Point(13, 103); + this.chkQtyMRQ.Location = new System.Drawing.Point(13, 118); this.chkQtyMRQ.Name = "chkQtyMRQ"; - this.chkQtyMRQ.Size = new System.Drawing.Size(405, 25); + this.chkQtyMRQ.Size = new System.Drawing.Size(424, 25); this.chkQtyMRQ.TabIndex = 27; this.chkQtyMRQ.Tag = "3"; this.chkQtyMRQ.Text = "Enter quantity manually (auto-proceed if RQ is read)."; @@ -415,9 +430,9 @@ this.chkNew.AutoSize = true; this.chkNew.Font = new System.Drawing.Font("맑은 고딕", 11F); this.chkNew.ForeColor = System.Drawing.Color.Gray; - this.chkNew.Location = new System.Drawing.Point(13, 72); + this.chkNew.Location = new System.Drawing.Point(13, 82); this.chkNew.Name = "chkNew"; - this.chkNew.Size = new System.Drawing.Size(247, 24); + this.chkNew.Size = new System.Drawing.Size(162, 24); this.chkNew.TabIndex = 24; this.chkNew.Tag = "2"; this.chkNew.Text = "Create new Reel ID."; @@ -429,10 +444,11 @@ this.tabPage2.Controls.Add(this.GrpSidConvData); this.tabPage2.Controls.Add(this.grpapplyjob); this.tabPage2.Controls.Add(this.grpApplySidinfo); + this.tabPage2.Controls.Add(this.grpApplyWMSinfo); this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(10); - this.tabPage2.Size = new System.Drawing.Size(725, 266); + this.tabPage2.Size = new System.Drawing.Size(725, 345); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Option Data"; this.tabPage2.UseVisualStyleBackColor = true; @@ -455,7 +471,7 @@ this.GrpSidConvData.Dock = System.Windows.Forms.DockStyle.Top; this.GrpSidConvData.Enabled = false; this.GrpSidConvData.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.GrpSidConvData.Location = new System.Drawing.Point(10, 174); + this.GrpSidConvData.Location = new System.Drawing.Point(10, 256); this.GrpSidConvData.Name = "GrpSidConvData"; this.GrpSidConvData.Size = new System.Drawing.Size(705, 82); this.GrpSidConvData.TabIndex = 34; @@ -469,10 +485,10 @@ this.chkCVSave.ForeColor = System.Drawing.Color.Tomato; this.chkCVSave.Location = new System.Drawing.Point(431, 47); this.chkCVSave.Name = "chkCVSave"; - this.chkCVSave.Size = new System.Drawing.Size(230, 23); + this.chkCVSave.Size = new System.Drawing.Size(216, 23); this.chkCVSave.TabIndex = 51; this.chkCVSave.Tag = "11"; - this.chkCVSave.Text = "Record change information to server"; + this.chkCVSave.Text = "Record change information"; this.chkCVSave.UseVisualStyleBackColor = true; // // chkCVApplyBatch @@ -597,9 +613,9 @@ this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label6.Location = new System.Drawing.Point(6, 54); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(55, 15); + this.label6.Size = new System.Drawing.Size(41, 15); this.label6.TabIndex = 29; - this.label6.Text = "Query Target"; + this.label6.Text = "Query"; // // label7 // @@ -608,9 +624,9 @@ this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label7.Location = new System.Drawing.Point(7, 28); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(55, 15); + this.label7.Size = new System.Drawing.Size(40, 15); this.label7.TabIndex = 29; - this.label7.Text = "Apply Target"; + this.label7.Text = "Apply"; // // grpapplyjob // @@ -628,7 +644,7 @@ this.grpapplyjob.Dock = System.Windows.Forms.DockStyle.Top; this.grpapplyjob.Enabled = false; this.grpapplyjob.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.grpapplyjob.Location = new System.Drawing.Point(10, 92); + this.grpapplyjob.Location = new System.Drawing.Point(10, 174); this.grpapplyjob.Name = "grpapplyjob"; this.grpapplyjob.Size = new System.Drawing.Size(705, 82); this.grpapplyjob.TabIndex = 33; @@ -665,9 +681,9 @@ this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label3.Location = new System.Drawing.Point(6, 54); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(55, 15); + this.label3.Size = new System.Drawing.Size(41, 15); this.label3.TabIndex = 29; - this.label3.Text = "Query Target"; + this.label3.Text = "Query"; // // label2 // @@ -676,9 +692,9 @@ this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label2.Location = new System.Drawing.Point(7, 28); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(55, 15); + this.label2.Size = new System.Drawing.Size(40, 15); this.label2.TabIndex = 29; - this.label2.Text = "Apply Target"; + this.label2.Text = "Apply"; // // chkDayApplyVender // @@ -778,7 +794,7 @@ this.grpApplySidinfo.Dock = System.Windows.Forms.DockStyle.Top; this.grpApplySidinfo.Enabled = false; this.grpApplySidinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.grpApplySidinfo.Location = new System.Drawing.Point(10, 10); + this.grpApplySidinfo.Location = new System.Drawing.Point(10, 92); this.grpApplySidinfo.Name = "grpApplySidinfo"; this.grpApplySidinfo.Size = new System.Drawing.Size(705, 82); this.grpApplySidinfo.TabIndex = 33; @@ -816,10 +832,10 @@ this.chkInfoSave.ForeColor = System.Drawing.Color.Tomato; this.chkInfoSave.Location = new System.Drawing.Point(431, 50); this.chkInfoSave.Name = "chkInfoSave"; - this.chkInfoSave.Size = new System.Drawing.Size(230, 23); + this.chkInfoSave.Size = new System.Drawing.Size(216, 23); this.chkInfoSave.TabIndex = 32; this.chkInfoSave.Tag = "8"; - this.chkInfoSave.Text = "Record change information to server"; + this.chkInfoSave.Text = "Record change information"; this.chkInfoSave.UseVisualStyleBackColor = true; // // chkInfoApplyPrint @@ -840,9 +856,9 @@ this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label4.Location = new System.Drawing.Point(6, 54); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(55, 15); + this.label4.Size = new System.Drawing.Size(41, 15); this.label4.TabIndex = 29; - this.label4.Text = "Query Target"; + this.label4.Text = "Query"; // // label5 // @@ -851,9 +867,9 @@ this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.label5.Location = new System.Drawing.Point(7, 28); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(55, 15); + this.label5.Size = new System.Drawing.Size(40, 15); this.label5.TabIndex = 29; - this.label5.Text = "Apply Target"; + this.label5.Text = "Apply"; // // chkInfoApplyVender // @@ -963,7 +979,7 @@ this.tableLayoutPanel3.Controls.Add(this.btOK, 1, 0); this.tableLayoutPanel3.Controls.Add(this.btCancle, 0, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel3.Location = new System.Drawing.Point(9, 593); + this.tableLayoutPanel3.Location = new System.Drawing.Point(9, 653); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); @@ -1066,11 +1082,174 @@ this.dataSet11.DataSetName = "DataSet1"; this.dataSet11.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // + // chkApplyWMSInfo + // + this.chkApplyWMSInfo.AutoSize = true; + this.chkApplyWMSInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.chkApplyWMSInfo.ForeColor = System.Drawing.Color.Gray; + this.chkApplyWMSInfo.Location = new System.Drawing.Point(13, 303); + this.chkApplyWMSInfo.Name = "chkApplyWMSInfo"; + this.chkApplyWMSInfo.Size = new System.Drawing.Size(446, 25); + this.chkApplyWMSInfo.TabIndex = 35; + this.chkApplyWMSInfo.Tag = "8"; + this.chkApplyWMSInfo.Text = "Automatically record data using WMS information table"; + this.chkApplyWMSInfo.UseVisualStyleBackColor = true; + this.chkApplyWMSInfo.CheckStateChanged += new System.EventHandler(this.checkBox1_CheckStateChanged); + // + // grpApplyWMSinfo + // + this.grpApplyWMSinfo.Controls.Add(this.checkBox36); + this.grpApplyWMSinfo.Controls.Add(this.chkWMSApplyBatch); + this.grpApplyWMSinfo.Controls.Add(this.label22); + this.grpApplyWMSinfo.Controls.Add(this.label23); + this.grpApplyWMSinfo.Controls.Add(this.checkBox41); + this.grpApplyWMSinfo.Controls.Add(this.checkBox42); + this.grpApplyWMSinfo.Controls.Add(this.checkBox43); + this.grpApplyWMSinfo.Controls.Add(this.checkBox44); + this.grpApplyWMSinfo.Controls.Add(this.checkBox45); + this.grpApplyWMSinfo.Controls.Add(this.checkBox46); + this.grpApplyWMSinfo.Controls.Add(this.checkBox47); + this.grpApplyWMSinfo.Dock = System.Windows.Forms.DockStyle.Top; + this.grpApplyWMSinfo.Enabled = false; + this.grpApplyWMSinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.grpApplyWMSinfo.Location = new System.Drawing.Point(10, 10); + this.grpApplyWMSinfo.Name = "grpApplyWMSinfo"; + this.grpApplyWMSinfo.Size = new System.Drawing.Size(705, 82); + this.grpApplyWMSinfo.TabIndex = 36; + this.grpApplyWMSinfo.TabStop = false; + this.grpApplyWMSinfo.Text = "WMS Information Application"; + // + // checkBox36 + // + this.checkBox36.AutoSize = true; + this.checkBox36.ForeColor = System.Drawing.Color.Blue; + this.checkBox36.Location = new System.Drawing.Point(311, 51); + this.checkBox36.Name = "checkBox36"; + this.checkBox36.Size = new System.Drawing.Size(62, 23); + this.checkBox36.TabIndex = 37; + this.checkBox36.Tag = "11"; + this.checkBox36.Text = "VLOT"; + this.checkBox36.UseVisualStyleBackColor = true; + // + // chkWMSApplyBatch + // + this.chkWMSApplyBatch.AutoSize = true; + this.chkWMSApplyBatch.ForeColor = System.Drawing.Color.Green; + this.chkWMSApplyBatch.Location = new System.Drawing.Point(431, 24); + this.chkWMSApplyBatch.Name = "chkWMSApplyBatch"; + this.chkWMSApplyBatch.Size = new System.Drawing.Size(63, 23); + this.chkWMSApplyBatch.TabIndex = 35; + this.chkWMSApplyBatch.Tag = "9"; + this.chkWMSApplyBatch.Text = "Batch"; + this.chkWMSApplyBatch.UseVisualStyleBackColor = true; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label22.Location = new System.Drawing.Point(6, 54); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(41, 15); + this.label22.TabIndex = 29; + this.label22.Text = "Query"; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label23.Location = new System.Drawing.Point(7, 28); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(40, 15); + this.label23.TabIndex = 29; + this.label23.Text = "Apply"; + // + // checkBox41 + // + this.checkBox41.AutoSize = true; + this.checkBox41.Location = new System.Drawing.Point(311, 24); + this.checkBox41.Name = "checkBox41"; + this.checkBox41.Size = new System.Drawing.Size(114, 23); + this.checkBox41.TabIndex = 28; + this.checkBox41.Tag = "3"; + this.checkBox41.Text = "Vender Name"; + this.checkBox41.UseVisualStyleBackColor = true; + // + // checkBox42 + // + this.checkBox42.AutoSize = true; + this.checkBox42.ForeColor = System.Drawing.Color.Blue; + this.checkBox42.Location = new System.Drawing.Point(255, 50); + this.checkBox42.Name = "checkBox42"; + this.checkBox42.Size = new System.Drawing.Size(50, 23); + this.checkBox42.TabIndex = 27; + this.checkBox42.Tag = "7"; + this.checkBox42.Text = "SID"; + this.checkBox42.UseVisualStyleBackColor = true; + // + // checkBox43 + // + this.checkBox43.AutoSize = true; + this.checkBox43.ForeColor = System.Drawing.Color.Blue; + this.checkBox43.Location = new System.Drawing.Point(156, 50); + this.checkBox43.Name = "checkBox43"; + this.checkBox43.Size = new System.Drawing.Size(93, 23); + this.checkBox43.TabIndex = 25; + this.checkBox43.Tag = "6"; + this.checkBox43.Text = "Cust Code"; + this.checkBox43.UseVisualStyleBackColor = true; + // + // checkBox44 + // + this.checkBox44.AutoSize = true; + this.checkBox44.ForeColor = System.Drawing.Color.Blue; + this.checkBox44.Location = new System.Drawing.Point(73, 50); + this.checkBox44.Name = "checkBox44"; + this.checkBox44.Size = new System.Drawing.Size(77, 23); + this.checkBox44.TabIndex = 25; + this.checkBox44.Tag = "5"; + this.checkBox44.Text = "Part No"; + this.checkBox44.UseVisualStyleBackColor = true; + // + // checkBox45 + // + this.checkBox45.AutoSize = true; + this.checkBox45.Location = new System.Drawing.Point(255, 24); + this.checkBox45.Name = "checkBox45"; + this.checkBox45.Size = new System.Drawing.Size(50, 23); + this.checkBox45.TabIndex = 26; + this.checkBox45.Tag = "2"; + this.checkBox45.Text = "SID"; + this.checkBox45.UseVisualStyleBackColor = true; + // + // checkBox46 + // + this.checkBox46.AutoSize = true; + this.checkBox46.Location = new System.Drawing.Point(156, 24); + this.checkBox46.Name = "checkBox46"; + this.checkBox46.Size = new System.Drawing.Size(93, 23); + this.checkBox46.TabIndex = 25; + this.checkBox46.Tag = "1"; + this.checkBox46.Text = "Cust Code"; + this.checkBox46.UseVisualStyleBackColor = true; + // + // checkBox47 + // + this.checkBox47.AutoSize = true; + this.checkBox47.Location = new System.Drawing.Point(73, 24); + this.checkBox47.Name = "checkBox47"; + this.checkBox47.Size = new System.Drawing.Size(77, 23); + this.checkBox47.TabIndex = 25; + this.checkBox47.Tag = "0"; + this.checkBox47.Text = "Part No"; + this.checkBox47.UseVisualStyleBackColor = true; + // // fSelectJob // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(751, 701); + this.ClientSize = new System.Drawing.Size(751, 761); this.Controls.Add(this.panel2); this.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -1098,6 +1277,8 @@ this.tabPage3.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataSet11)).EndInit(); + this.grpApplyWMSinfo.ResumeLayout(false); + this.grpApplyWMSinfo.PerformLayout(); this.ResumeLayout(false); } @@ -1170,5 +1351,18 @@ private System.Windows.Forms.CheckBox chkCVApplySID; private System.Windows.Forms.CheckBox chkCVApplyCust; private System.Windows.Forms.CheckBox chkCVApplyPartno; + private System.Windows.Forms.CheckBox chkApplyWMSInfo; + private System.Windows.Forms.GroupBox grpApplyWMSinfo; + private System.Windows.Forms.CheckBox checkBox36; + private System.Windows.Forms.CheckBox chkWMSApplyBatch; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.CheckBox checkBox41; + private System.Windows.Forms.CheckBox checkBox42; + private System.Windows.Forms.CheckBox checkBox43; + private System.Windows.Forms.CheckBox checkBox44; + private System.Windows.Forms.CheckBox checkBox45; + private System.Windows.Forms.CheckBox checkBox46; + private System.Windows.Forms.CheckBox checkBox47; } } \ No newline at end of file diff --git a/Handler/Project/Dialog/fSelectJob.cs b/Handler/Project/Dialog/fSelectJob.cs index 26b1406..7c2650a 100644 --- a/Handler/Project/Dialog/fSelectJob.cs +++ b/Handler/Project/Dialog/fSelectJob.cs @@ -174,6 +174,21 @@ namespace Project.Dialog return; } } + if (grpApplyWMSinfo.Enabled) + { + //검색조건확인 + var v = CheckDataIn(grpApplyWMSinfo); + if (v.Item1 < 1) + { + UTIL.MsgE("Target item is not specified among WMS information items"); + return; + } + if (v.Item2 < 1) + { + UTIL.MsgE("Search item is not specified among WMS information items"); + return; + } + } if (grpApplySidinfo.Enabled) { //검색조건확인 @@ -244,6 +259,7 @@ namespace Project.Dialog VAR.BOOL[eVarBool.Opt_ApplySIDConv] = chkApplySIDConv.Checked; VAR.BOOL[eVarBool.Opt_ApplyJobInfo] = chkApplyJobInfo.Checked; + VAR.BOOL[eVarBool.Opt_ApplyWMSInfo] = chkApplyWMSInfo.Checked; VAR.BOOL[eVarBool.Opt_ApplySIDInfo] = chkApplySidInfo.Checked; VAR.BOOL[eVarBool.Opt_CheckSIDExist] = PUB.Result.vModel.CheckSIDExsit; @@ -255,15 +271,31 @@ namespace Project.Dialog if (SETTING.Data.SystemBypass) VAR.BOOL[eVarBool.Opt_DisablePrinter] = true; else VAR.BOOL[eVarBool.Opt_DisablePrinter] = PUB.Result.vModel.DisablePrinter || (SETTING.Data.Disable_PrinterL && SETTING.Data.Disable_PrinterR); + + //WMS Information + VAR.BOOL[eVarBool.Opt_WMS_Apply_PartNo] = checkBox47.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_CustCode] = checkBox46.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_SID] = checkBox45.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_VenderName] = checkBox41.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_batch] = chkWMSApplyBatch.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_qty] = false;// chkInfoApplyQty.Checked; + + VAR.BOOL[eVarBool.Opt_WMS_Where_PartNo] = checkBox44.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Where_CustCode] = checkBox43.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Where_SID] = checkBox42.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Where_VLOT] = checkBox36.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Where_MC] = false;// chkInfoWhereMC.Checked; + VAR.BOOL[eVarBool.Opt_WMS_WriteServer] = false;// chkInfoSave.Checked; + + //SID Information VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] = chkInfoApplyPart.Checked; VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] = chkInfoApplyCust.Checked; VAR.BOOL[eVarBool.Opt_SID_Apply_SID] = chkInfoApplySID.Checked; VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] = chkInfoApplyVender.Checked; VAR.BOOL[eVarBool.Opt_SID_Apply_PrintPos] = chkInfoApplyPrint.Checked; - - ///22092[ VAR.BOOL[eVarBool.Opt_SID_Apply_batch] = chkInfoApplyBatch.Checked; VAR.BOOL[eVarBool.Opt_SID_Apply_qty] = false;// chkInfoApplyQty.Checked; + VAR.BOOL[eVarBool.Opt_SID_Where_PartNo] = chkInfoWherePart.Checked; VAR.BOOL[eVarBool.Opt_SID_Where_CustCode] = chkInfoWhereCust.Checked; VAR.BOOL[eVarBool.Opt_SID_Where_SID] = chkInfoWhereSID.Checked; @@ -375,6 +407,13 @@ namespace Project.Dialog if (chk.Tag == null) continue; chk.Checked = UTIL.GetBitState(dr.vOption, int.Parse(chk.Tag.ToString())); } + foreach (var c in grpApplyWMSinfo.Controls) + { + if (c.GetType() != typeof(CheckBox)) continue; + var chk = c as CheckBox; + if (chk.Tag == null) continue; + chk.Checked = UTIL.GetBitState(dr.vWMSInfo, int.Parse(chk.Tag.ToString())); + } foreach (var c in grpApplySidinfo.Controls) { if (c.GetType() != typeof(CheckBox)) continue; @@ -418,6 +457,10 @@ namespace Project.Dialog { grpapplyjob.Enabled = chk.Checked; } + if(chk.Name.Equals(chkApplyWMSInfo.Name)) + { + grpApplyWMSinfo.Enabled = chk.Checked; + } if (chk.Name.Equals(chkApplySidInfo.Name)) { grpApplySidinfo.Enabled = chk.Checked; @@ -474,6 +517,13 @@ namespace Project.Dialog if (chk.Tag == null) continue; dr.vOption = UTIL.SetBitState((ushort)dr.vOption, int.Parse(chk.Tag.ToString()), chk.Checked); } + foreach (var c in grpApplyWMSinfo.Controls) + { + if (c.GetType() != typeof(CheckBox)) continue; + var chk = c as CheckBox; + if (chk.Tag == null) continue; + dr.vWMSInfo = UTIL.SetBitState((ushort)dr.vWMSInfo, int.Parse(chk.Tag.ToString()), chk.Checked); + } foreach (var c in grpApplySidinfo.Controls) { if (c.GetType() != typeof(CheckBox)) continue; @@ -535,8 +585,8 @@ namespace Project.Dialog void UpdateHeight() { - if (this.tabControl1.Visible) this.Height = 740; - else this.Height = 445; + if (this.tabControl1.Visible) this.Height = 755; + else this.Height = 380; } private void btOK_Click(object sender, EventArgs e) diff --git a/Handler/Project/Properties/Settings.Designer.cs b/Handler/Project/Properties/Settings.Designer.cs index 55037b1..11194ae 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 739b7c7..f3b2dc5 100644 --- a/Handler/Project/Properties/Settings.settings +++ b/Handler/Project/Properties/Settings.settings @@ -16,7 +16,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> @@ -24,7 +24,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> @@ -32,7 +32,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/RunCode/Device/_Keyence.cs b/Handler/Project/RunCode/Device/_Keyence.cs index a1f1a63..c0c01ee 100644 --- a/Handler/Project/RunCode/Device/_Keyence.cs +++ b/Handler/Project/RunCode/Device/_Keyence.cs @@ -39,7 +39,9 @@ namespace Project if (PUB.sm.Step != eSMStep.HOME_FULL && PUB.sm.Step != eSMStep.HOME_QUICK) { // PUB.logKeyence.Add($"{resp.Replace("\n", "").Replace("\r", "")}"); - ParseBarcode(e.RawData, dev.Tag.ToString()); + var rawdata = e.RawData; //↔▲▼ + rawdata = rawdata.Replace('\x1D', '↔').Replace('\x1E', '▲').Replace('\x04', '▼'); + ParseBarcode(rawdata, dev.Tag.ToString()); } else { @@ -155,14 +157,14 @@ namespace Project foreach (var resp in frames) { var bcddata = resp.Trim().Split(','); - if(resp.Equals("0:ERROR")) + if (resp.Equals("0:ERROR")) { PUB.log.AddE($"[{Source}] {resp}"); continue; } else if (bcddata.Length > 2 && bcddata[1] == "BLOAD") { - if(bcddata[0] =="ER") + if (bcddata[0] == "ER") { PUB.log.AddE($"[{Source}]Bacode Memory Read Error({resp})"); } diff --git a/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs b/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs index 484e726..9560beb 100644 --- a/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs +++ b/Handler/Project/RunCode/RunSequence/3_KEYENCE_READ.cs @@ -17,6 +17,7 @@ namespace Project Complete, TimeOut, MultiSID, + Nothing, } public EResultKeyence KEYENCE_READ(eWorkPort target, eSMStep cmdIndex) { @@ -161,444 +162,10 @@ namespace Project return EResultKeyence.TimeOut; } - //수량임의 입력의 경우 - if (VAR.BOOL[eVarBool.Opt_UserQtyRQ]) - { - if (itemC.VisionData.QTYRQ) vQtyOK = true; ////RQ의 값이 들어있으면 성공 - else vQtyOK = false; //수량임의모드인데 RQ값이 들어있지않으면 자동진행하지 않는다 - } - else - { - //자동에서는 수량값이 들어있으면 바로 넘어가게한다. - vQtyOK = itemC.VisionData.QTY.isEmpty() == false; - } - //커스터머 이름 확인 - if (OPT_BYPASS == false && (itemC.VisionData.CUSTNAME.isEmpty() && itemC.VisionData.CUSTCODE.isEmpty() == false)) - { - var qta = new DataSet1TableAdapters.QueriesTableAdapter(); - var custname = qta.GetCustName(itemC.VisionData.CUSTCODE); - if (custname.isEmpty() == false) - { - PUB.log.Add($"New CustName => {custname}"); - itemC.VisionData.CUSTNAME = custname; - } - } - - //기본 벤더이름 - if (OPT_BYPASS == false && PUB.Result.vModel.Def_Vname.isEmpty() == false) - { - if (itemC.VisionData.VNAME.Equals(PUB.Result.vModel.Def_Vname) == false) - { - itemC.VisionData.VNAME = PUB.Result.vModel.Def_Vname; - itemC.VisionData.VNAME_Trust = true; - PUB.log.Add($"Defaul V.Name Set to {PUB.Result.vModel.Def_Vname}"); - } - } - - //기본 MFG - if (OPT_BYPASS == false && PUB.Result.vModel.Def_MFG.isEmpty() == false) - { - if (itemC.VisionData.MFGDATE.Equals(PUB.Result.vModel.Def_MFG) == false) - { - itemC.VisionData.MFGDATE = PUB.Result.vModel.Def_MFG; - itemC.VisionData.MFGDATE_Trust = true; - 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.BarcodeTouched == 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.PadLeft(10, '0')}'"); - 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.BarcodeTouched == 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 (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); - else Apply = false; - } - 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 (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($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); - else Apply = false; - } - - if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 - { - if (AR.SETTING.Data.McName.isEmpty() == false) - wheres.Add($"attach='{AR.SETTING.Data.McName}'"); - else Apply = false; - } - - //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) - { - if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC) == true) - NewBarcodeUpdated = true; - - PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL; - } - } - } - - //시드변환정보에서 정보 추출 - if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeTouched == 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 (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); - 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; - } - - - //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.BarcodeTouched == 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.PadLeft(10, '0')}'"); - 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.BarcodeTouched == true && NewBarcodeUpdated == false) - { - itemC.VisionData.BarcodeTouched = false; - } - - //릴Id 신규부여 - if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_NewReelID]) - { - if (itemC.VisionData.RIDNew == false && itemC.VisionData.CUSTCODE.isEmpty() == false && itemC.VisionData.SID.isEmpty() == false) - { - var newid = PUB.MakeNewREELID(itemC.VisionData.SID);// Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD(itemC.VisionData.CUSTCODE, "4", "A", out string errmsg); - if (newid.success == true) - { - //backup origin reel id - itemC.VisionData.RID0 = itemC.VisionData.RID; - - //set new reel id - itemC.VisionData.SetRID(newid.newid, "SPS:CHKDATACOMPLETE");// = newid; - itemC.VisionData.RIDNew = true; //applied new reel id - - //서버의수량업데이트기능이 켜져있다면 해당 값을 제거해준다. (다시 조회되도록 함) - if (VAR.BOOL[eVarBool.Opt_ServerQty]) - { - //이미 수량업데이트된 경우이므로 복원시켜준다 - if (itemC.VisionData.QTY0.isEmpty() == false) - { - PUB.log.AddAT($"Restoring quantity due to reel ID change ({itemC.VisionData.QTY}->{itemC.VisionData.QTY0})"); - itemC.VisionData.QTY = itemC.VisionData.QTY0; - itemC.VisionData.QTY0 = string.Empty; - } - } - } - else - { - var logtime = VAR.TIME.RUN((int)eVarTime.LOG_NEWIDERROR); - if (logtime.TotalSeconds >= 3000) - { - PUB.log.AddAT($"Reel_ID generation failed : {newid.message}"); - VAR.TIME.Update(eVarTime.LOG_NEWIDERROR); - } - } - } - } - - bool BatchValueOK = false; - if (mv.IgnoreBatch) BatchValueOK = true; - else BatchValueOK = itemC.VisionData.BATCH.isEmpty() == false; - - bool partnoValueOK = false; - if (PUB.Result.vModel.IgnorePartNo) partnoValueOK = true; - else partnoValueOK = itemC.VisionData.PARTNO.isEmpty() == false; - - - //데이터확정 및 완료처리 - if (itemC.VisionData.Confirm) - { - //이미 완료된 데이터 - if (itemC.VisionData.ConfirmAuto) - PUB.log.AddI($"Proceeding due to data confirmation completion (automatic)"); - else if (itemC.VisionData.ConfirmUser) - PUB.log.AddI($"Proceeding due to data confirmation completion (manual)"); - else - PUB.log.AddI($"Proceeding due to data confirmation completion (BYPASS)"); - } - else if (itemC.VisionData.QRInputRaw.isEmpty() == false && BatchValueOK) - { - //ATK STD QR데이터가 입력되었으니 더이상 읽지 않아도 진행하도록 하자 - //데이터가 부족하다면 바로 채우기 작업을 해야한다 - CheckDataComplte(itemC, "STD", true); - return EResultKeyence.Wait; - } - else if (vQtyOK && - (OPT_BYPASS || itemC.VisionData.VNAME.isEmpty() == false) && - itemC.VisionData.VLOT.isEmpty() == false && - itemC.VisionData.SID.Length == 9 && - (OPT_BYPASS || itemC.VisionData.MFGDATE.isEmpty() == false) && - partnoValueOK && - BatchValueOK && - itemC.VisionData.RID.isEmpty() == false) - { - //모든값이 입력되어 있다면 조건 체크후 진행할 수 있도록 한다 - //2206211400 - CheckDataComplte(itemC, "SINGLE", true); - return EResultKeyence.Wait; - } - else - { - //아직데이터가 완료되지 않았다면 - //대기시간이 지나면 사용자 확인창을 띄운다 - return EResultKeyence.Wait; - } + var prcResult = BCDProcess_ALL(itemC, "SEQ",true); + if (prcResult != EResultKeyence.Nothing) + return prcResult; PUB.sm.seq.Update(cmdIndex); return EResultKeyence.Wait; @@ -637,13 +204,6 @@ namespace Project return; } - //Customer Code - if (OPT_BYPASS == false && item.VisionData.CUSTCODE.isEmpty() && CustomerCode.isEmpty() == false) - { - item.VisionData.CUSTCODE = CustomerCode; - PUB.log.Add($"[FIX] CUSTOMER CODE => {CustomerCode}"); - } - //서버의수량업데이트기능 if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_ServerQty]) { @@ -699,12 +259,23 @@ namespace Project } } + + //프린트위치확인 + if (item.VisionData.PrintPositionData.isEmpty() == true || item.VisionData.PrintPositionCheck == false) + { + if (NeedConfirm == false) + { + //현작업내에서의 정보를 찾아서 적용한다 231005 + if (mainjob) item.VisionData.bcdMessage.Add("Attachment position not found"); + NeedConfirm = true; + } + } + //SID 존재여부 확인 if (OPT_BYPASS == false && item.VisionData.SID_Trust && VAR.BOOL[eVarBool.Opt_CheckSIDExist]) { //ECS목록에 데이터가 업다면 오류로 처리한다 var SID = item.VisionData.SID; - var MCName = VAR.BOOL[eVarBool.Use_Conveyor] ? "IB" : SETTING.Data.McName; var ta = new DataSet1TableAdapters.QueriesTableAdapter(); var exist = ta.CheckSIDExist(SID) > 0; PUB.log.Add($"SID Exist Check SID:{item.VisionData.SID},Result={exist}"); @@ -717,35 +288,11 @@ namespace Project //sid변환기능확인 var SIDOK = false; - if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_SIDConvert] && VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false) + if (OPT_BYPASS == false && + VAR.BOOL[eVarBool.Opt_SIDConvert] && + PUB.flag.get(eVarBool.FG_WAIT_LOADERINFO) == false && + VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false) { - //변환된 정보가 없다면 변환을 진행한다 - if (item.VisionData.SID0.isEmpty() && item.VisionData.SID_Trust && item.VisionData.SID.isEmpty() == false) - { - //이 sid가 존재여부확인 후 없는 sid라면 더이상 처리하지 않는다 230510 - if (PUB.Result.DTSidConvertEmptyList.Contains(item.VisionData.SID)) - { - //존재하지 않는 SID로 이미 확인되었다 - } - else if (PUB.Result.DTSidConvertMultiList.Contains(item.VisionData.SID)) - { - //다중sid로 인해 처리하지 않는다 - } - else - { - var newsid = PUB.SIDCovert(item.VisionData.SID, "SPS_BarcodeProcess", out bool converr); - if (converr) - { - if (PUB.sm.Step == eSMStep.RUN) - PUB.log.AddE(newsid); - } - else - { - item.VisionData.SID0 = item.VisionData.SID; //기존자료를 0으로 백업한다 - item.VisionData.SID = newsid; //신규 SID를 기록 - } - } - } //시드값이 유효한지 확인한다. SIDOK = item.VisionData.SID_Trust && item.VisionData.SID0.isEmpty() == false && item.VisionData.SID.isEmpty() == false; } @@ -787,63 +334,6 @@ namespace Project } } - - - //프린트위치확인 - if (item.VisionData.PrintPositionData.isEmpty() == true || item.VisionData.PrintPositionCheck == false) - { - if (OPT_BYPASS) - { - //바이패스해야하는 경우라면 프린트위치를 임의로 한다 - if (item.VisionData.PrintPositionData.isEmpty()) - { - item.VisionData.PrintPositionData = "1"; - item.VisionData.PrintPositionCheck = true; - PUB.log.AddI($"Print position arbitrarily set due to bypass SID ({item.VisionData.SID})"); - } - } - else - { - //기록된 현재작업의 인쇄위치 정보에서 찾는다 231005 - if (PUB.Result.PrintPostionList.ContainsKey(item.VisionData.SID)) - { - var preprnpos = PUB.Result.PrintPostionList[item.VisionData.SID]; - item.VisionData.PrintPositionData = preprnpos; - item.VisionData.PrintPositionCheck = true; - PUB.log.AddI($"Print position found in current job info SID:{item.VisionData.SID}, Value={preprnpos}"); - } - else if (NeedConfirm == false) - { - //현작업내에서의 정보를 찾아서 적용한다 231005 - if (mainjob) item.VisionData.bcdMessage.Add("Attachment position not found"); - NeedConfirm = true; - } - } - } - - //바이패스모드에서 벤더네임이지정(101시드에 벤더네임이 없다) - if (OPT_BYPASS) - { - if (item.VisionData.VNAME_Trust == false) - { - item.VisionData.VNAME = "BYPASS"; - item.VisionData.VNAME_Trust = true; - } - } - - //ignore partno value - if (PUB.Result.vModel.IgnorePartNo == true && item.VisionData.PARTNO_Trust == false) - { - PUB.log.Add("PartNo Trust by Ignore PartNo Setting(opmodel)"); - item.VisionData.PARTNO_Trust = true; - } - - //ignore batch value - if (PUB.Result.vModel.IgnoreBatch == true) - { - - } - //데이터의 신뢰성을 확인하고 모두 입력되었다면 자동 확정을 진행한다 if (item.VisionData.MFGDATE_Trust && item.VisionData.PARTNO_Trust && diff --git a/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs b/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs index 713bdcf..e2415d7 100644 --- a/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs +++ b/Handler/Project/RunCode/StateMachine/_SPS_BarcodeProcess.cs @@ -214,6 +214,7 @@ namespace Project var patterns = PUB.Result.BCDPattern; var itemC = PUB.Result.ItemDataC; var vdata = itemC.VisionData; + bool vQtyOK = false; //No Run - Confirm Data if (vdata.Confirm) return; @@ -242,442 +243,10 @@ namespace Project } } - //assign customer code - fixed data - if (vdata.CUSTCODE.isEmpty() && VAR.STR[eVarString.JOB_CUSTOMER_CODE].isEmpty() == false) + //all process sequence + if (BCDProcess_ALL(itemC, "SPS", PUB.sm.Step == eSMStep.RUN) != EResultKeyence.Nothing) { - vdata.CUSTCODE = VAR.STR[eVarString.JOB_CUSTOMER_CODE]; - PUB.log.Add($"Cutomer Code 고정값 사용 : {vdata.CUSTCODE}"); - } - - //SiD CONVERT - if (VAR.BOOL[eVarBool.Opt_SIDConvert]) - { - if (PUB.flag.get(eVarBool.FG_WAIT_LOADERINFO) == false && VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false) - { - //원본시드(sid0)가 비어있는데 sid과 확정되었다면 변환작업을 진행한다 - if (vdata.SID0.isEmpty() && vdata.SID.isEmpty() == false && vdata.SID_Trust) - { - //이 sid가 존재여부확인 후 없는 sid라면 더이상 처리하지 않는다 230510 - if (PUB.Result.DTSidConvertEmptyList.Contains(vdata.SID)) - { - //존재하지 않는 SID로 이미 확인되었다 - } - else if (PUB.Result.DTSidConvertMultiList.Contains(vdata.SID)) - { - //다중sid로 인해 처리하지 않는다 - } - else - { - var newsid = PUB.SIDCovert(vdata.SID, "SPS_BarcodeProcess", out bool converr); - if (converr) - { - if (PUB.sm.Step == eSMStep.RUN) - PUB.log.AddE(newsid); - } - else - { - vdata.SID0 = vdata.SID; - vdata.SID = newsid; - } - } - - } - } - } - - //정규식혹은 바코드 룰에 의해 데이터가 바뀌었더라도 모델 기준으로 진행한다 - if (PUB.Result.vModel.Def_Vname.isEmpty() == false) - { - if (itemC.VisionData.VNAME.Equals(PUB.Result.vModel.Def_Vname) == false) - { - itemC.VisionData.VNAME = PUB.Result.vModel.Def_Vname.Trim(); - itemC.VisionData.VNAME_Trust = true; - PUB.log.Add($"Defaul V.Name Set to {PUB.Result.vModel.Def_Vname}"); - } - } - if (PUB.Result.vModel.Def_MFG.isEmpty() == false) - { - if (itemC.VisionData.MFGDATE.Equals(PUB.Result.vModel.Def_MFG) == false) - { - itemC.VisionData.MFGDATE = PUB.Result.vModel.Def_MFG.Trim(); - itemC.VisionData.MFGDATE_Trust = true; - PUB.log.Add($"Defaul MFGDATE Set to {PUB.Result.vModel.Def_MFG}"); - } - } - - //릴ID 신규발행 - if (PUB.sm.Step == eSMStep.RUN && vdata.CUSTCODE.isEmpty() == false) - { - if (VAR.BOOL[eVarBool.Opt_NewReelID]) - { - if (itemC.VisionData.RIDNew == false) - { - var newid = PUB.MakeNewREELID(itemC.VisionData.SID);// Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD(itemC.VisionData.CUSTCODE, "4", "A", out string errmsg); - if (newid.success == true) - { - //backup origin reel id - itemC.VisionData.RID0 = itemC.VisionData.RID; - - //set new reel id - PUB.log.Add("new reelid bacodeprecess"); - itemC.VisionData.SetRID(newid.newid, "SPS:CHKDATACOMPLETE");// = newid; - itemC.VisionData.RIDNew = true; //applied new reel id - - //서버의수량업데이트기능이 켜져있다면 해당 값을 제거해준다. (다시 조회되도록 함) - if (VAR.BOOL[eVarBool.Opt_ServerQty]) - { - //이미 수량업데이트된 경우이므로 복원시켜준다 - if (itemC.VisionData.QTY0.isEmpty() == false) - { - PUB.log.AddAT($"릴아이디 변경으로 인해 수량을 복원합니다({itemC.VisionData.QTY}->{itemC.VisionData.QTY0})"); - itemC.VisionData.QTY = itemC.VisionData.QTY0; - itemC.VisionData.QTY0 = string.Empty; - } - } - } - else - { - var logtime = VAR.TIME.RUN((int)eVarTime.LOG_NEWIDERROR); - if (logtime.TotalSeconds >= 3000) - { - PUB.log.AddAT($"Reel_ID 생성실패 : {newid.message}"); - VAR.TIME.Update(eVarTime.LOG_NEWIDERROR); - } - } - } - } - } - - - //바코드가 변경된 경우이다, 자동채우기 기능이 있다면 사용한다 - bool NewBarcodeUpdated = false; - //[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음) - //[WMS] 에서 중복검색되면 팝업을 해야하므로 이것을 먼저 처리한다. - if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeTouched == 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.PadLeft(10,'0')}'"); - 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.BarcodeTouched == 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 (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); - else Apply = false; - } - 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 (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($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); - else Apply = false; - } - - if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 - { - if (AR.SETTING.Data.McName.isEmpty() == false) - wheres.Add($"attach='{AR.SETTING.Data.McName}'"); - else Apply = false; - } - - //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) - { - if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC) == true) - NewBarcodeUpdated = true; - - PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL; - } - } - } - - //시드변환정보에서 정보 추출 - if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeTouched == 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 (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode]) - { - if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); - 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; - } - - - //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.BarcodeTouched == 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.PadLeft(10, '0')}'"); - 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 (PUB.sm.Step == eSMStep.RUN) - { - bool BatchValueOK = false; - if (PUB.Result.vModel.IgnoreBatch) BatchValueOK = true; - else BatchValueOK = itemC.VisionData.BATCH.isEmpty() == false; - - bool partnoValueOK = false; - if (PUB.Result.vModel.IgnorePartNo) partnoValueOK = true; - else partnoValueOK = itemC.VisionData.PARTNO.isEmpty() == false; - - var CVMode = VAR.BOOL[eVarBool.Use_Conveyor]; - if (itemC.VisionData.VNAME.isEmpty() == false && - itemC.VisionData.VLOT.isEmpty() == false && - itemC.VisionData.SID.Length == 9 && - itemC.VisionData.MFGDATE.isEmpty() == false && - partnoValueOK && - BatchValueOK && - itemC.VisionData.RID.isEmpty() == false) - { - //모든값이 입력되어 있다면 조건 체크후 진행할 수 있도록 한다 - CheckDataComplte(itemC, "SPS-BARCODEPROCESS", false); //2206211400 - } - //CheckDataComplte(PUB.Result.ItemDataC, "SPS-BARCODEPROCESS"); - } - - //바코드 처리 여부 변경 - if (vdata.BarcodeTouched == true && NewBarcodeUpdated == false) - { - vdata.BarcodeTouched = false; - var a = PUB.Result.ItemDataC.VisionData.BarcodeTouched; + //nothing : multisid condition } diff --git a/Handler/Project/STDLabelAttach(ATV).csproj b/Handler/Project/STDLabelAttach(ATV).csproj index de6919a..1643695 100644 --- a/Handler/Project/STDLabelAttach(ATV).csproj +++ b/Handler/Project/STDLabelAttach(ATV).csproj @@ -630,6 +630,9 @@ CtlTowerLamp.cs + + Form + Form @@ -667,7 +670,6 @@ Form - diff --git a/Handler/Project/Util/BarcodeDataProcessing.cs b/Handler/Project/Util/BarcodeDataProcessing.cs new file mode 100644 index 0000000..c5d8f9b --- /dev/null +++ b/Handler/Project/Util/BarcodeDataProcessing.cs @@ -0,0 +1,644 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using AR; +using Project.Class; + +namespace Project +{ + public partial class FMain + { + + EResultKeyence BCDProcess_ALL(Class.JobData itemC, string Src, bool CompleteCheck) + { + var mainJob = Src.Equals("SPS") == false; + + //assign customer code - fixed data + if (itemC.VisionData.CUSTCODE.isEmpty() && VAR.STR[eVarString.JOB_CUSTOMER_CODE].isEmpty() == false) + { + itemC.VisionData.CUSTCODE = VAR.STR[eVarString.JOB_CUSTOMER_CODE]; + PUB.log.Add($"Cutomer Code 고정값 사용 : {itemC.VisionData.CUSTCODE}"); + } + + + + //커스터머 이름 확인 + if (mainJob && PUB.OPT_BYPASS() == false) + BCDProcess_GetCustomerName(itemC); + + //Ignore Value + BCDProcess_IgnoreValue(itemC); + + //기본 벤더이름 + BCDProcess_DefVenderName(itemC); + + //기본 MFG + BCDProcess_DefMFGDate(itemC); + + //바코드가 변경된 경우이다, 자동채우기 기능이 있다면 사용한다 + bool NewBarcodeUpdated = false; + + //[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음) + //[WMS] 에서 중복검색되면 팝업을 해야하므로 이것을 먼저 처리한다. + if (VAR.BOOL[eVarBool.Opt_ApplyWMSInfo] && itemC.VisionData.BarcodeTouched == true) + { + var rlt_FindWMD = BCDProcess_FindWMSInfo(itemC); + if (rlt_FindWMD.NewBarcodeUpdated) NewBarcodeUpdated = true; + if (rlt_FindWMD.retval == EResultKeyence.MultiSID) return rlt_FindWMD.retval; + } + + //SID정보테이블에서 정보 추출 + if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && itemC.VisionData.BarcodeTouched == true) + { + if (BCDProcess_FindSIDInfo(itemC) == true) NewBarcodeUpdated = true; + } + + //시드변환정보에서 정보 추출 + if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && itemC.VisionData.BarcodeTouched == true) + { + if (BCDProcess_FindSIDConv(itemC) == true) NewBarcodeUpdated = true; + } + + //기존 작업에서 데이터를 찾아서 쓴다 + if (VAR.BOOL[eVarBool.Opt_ApplyJobInfo] && itemC.VisionData.BarcodeTouched == true) + { + if (BCDProcess_FindJobData(itemC) == true) NewBarcodeUpdated = true; + } + + //릴ID 신규발행 + if (mainJob && PUB.OPT_BYPASS() == false && VAR.BOOL[eVarBool.Opt_NewReelID]) + BCDProcess_MakeReelID(itemC); + + //SiD CONVERT + if (PUB.OPT_BYPASS() == false && + VAR.BOOL[eVarBool.Opt_SIDConvert] && + PUB.flag.get(eVarBool.FG_WAIT_LOADERINFO) == false && + VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false) + { + //원본시드(sid0)가 비어있는데 sid과 확정되었다면 변환작업을 진행한다 + BCDProcess_SIDConvert(itemC); + } + + //Print Position + BCDProcess_BCDPrint(itemC); + + + + //해당 바코드작업이 완료되었는지 확인한다. 신규 바코드값이 업데이트되면 한번더 동작하도록 한다 + if (itemC.VisionData.BarcodeTouched == true && NewBarcodeUpdated == false) + { + itemC.VisionData.BarcodeTouched = false; + } + + bool BatchValueOK = false; + if (PUB.Result.vModel.IgnoreBatch) BatchValueOK = true; + else BatchValueOK = itemC.VisionData.BATCH.isEmpty() == false; + + bool partnoValueOK = false; + if (PUB.Result.vModel.IgnorePartNo) partnoValueOK = true; + else partnoValueOK = itemC.VisionData.PARTNO.isEmpty() == false; + + + //수량임의 입력의 경우 + bool vQtyOK = false; + if (VAR.BOOL[eVarBool.Opt_UserQtyRQ]) + { + if (itemC.VisionData.QTYRQ) vQtyOK = true; ////RQ의 값이 들어있으면 성공 + else vQtyOK = false; //수량임의모드인데 RQ값이 들어있지않으면 자동진행하지 않는다 + } + else + { + //자동에서는 수량값이 들어있으면 바로 넘어가게한다. + vQtyOK = itemC.VisionData.QTY.isEmpty() == false; + } + + //데이터확정 및 완료처리 + if (CompleteCheck) + { + + if (itemC.VisionData.Confirm) + { + //이미 완료된 데이터 + if (mainJob) + { + if (itemC.VisionData.ConfirmAuto) + PUB.log.AddI($"Proceeding due to data confirmation completion (automatic)"); + else if (itemC.VisionData.ConfirmUser) + PUB.log.AddI($"Proceeding due to data confirmation completion (manual)"); + else + PUB.log.AddI($"Proceeding due to data confirmation completion (BYPASS)"); + } + } + else if (vQtyOK && + (itemC.VisionData.VNAME.isEmpty() == false) && + itemC.VisionData.VLOT.isEmpty() == false && + itemC.VisionData.SID.Length == 9 && + itemC.VisionData.MFGDATE.isEmpty() == false && + partnoValueOK && + BatchValueOK && + itemC.VisionData.RID.isEmpty() == false) + { + //모든값이 입력되어 있다면 조건 체크후 진행할 수 있도록 한다 + //2206211400 + CheckDataComplte(itemC, Src, mainJob); + return EResultKeyence.Wait; + } + else + { + //아직데이터가 완료되지 않았다면 + //대기시간이 지나면 사용자 확인창을 띄운다 + return EResultKeyence.Wait; + } + } + + + return EResultKeyence.Nothing; + } + + //커스터머 이름 확인 + void BCDProcess_GetCustomerName(Class.JobData itemC) + { + if (itemC.VisionData.CUSTNAME.isEmpty() && itemC.VisionData.CUSTCODE.isEmpty() == false) + { + var qta = new DataSet1TableAdapters.QueriesTableAdapter(); + var custname = qta.GetCustName(itemC.VisionData.CUSTCODE); + if ((custname ?? string.Empty).isEmpty() == false) + { + PUB.log.Add($"New CustName => {custname}"); + itemC.VisionData.CUSTNAME = custname; + } + } + } + + bool BCDProcess_BCDPrint(Class.JobData itemC) + { + var OPT_BYPASS = PUB.OPT_BYPASS(); + bool NeedConfirm = false; + if (itemC.VisionData.PrintPositionData.isEmpty() == true || itemC.VisionData.PrintPositionCheck == false) + { + if (OPT_BYPASS) + { + //바이패스해야하는 경우라면 프린트위치를 임의로 한다 + itemC.VisionData.PrintPositionData = "1"; + itemC.VisionData.PrintPositionCheck = true; + PUB.log.AddI($"Print position arbitrarily set due to bypass SID ({itemC.VisionData.SID})"); + } + else if (itemC.VisionData.SID.isEmpty()) + { + //no sid need confirm + NeedConfirm = true; + } + else + { + //기록된 현재작업의 인쇄위치 정보에서 찾는다 231005 + if (PUB.Result.PrintPostionList.ContainsKey(itemC.VisionData.SID)) + { + var preprnpos = PUB.Result.PrintPostionList[itemC.VisionData.SID]; + itemC.VisionData.PrintPositionData = preprnpos; + itemC.VisionData.PrintPositionCheck = true; + PUB.log.AddI($"Print position found in current job info SID:{itemC.VisionData.SID}, Value={preprnpos}"); + } + else if (NeedConfirm == false) + { + //현작업내에서의 정보를 찾아서 적용한다 231005 + NeedConfirm = true; + } + } + } + return NeedConfirm; + } + + void BCDProcess_IgnoreValue(Class.JobData itemC) + { + if (PUB.Result.vModel.IgnorePartNo == true && itemC.VisionData.PARTNO_Trust == false) + { + PUB.log.Add("PartNo Trust by Ignore PartNo Setting(opmodel)"); + itemC.VisionData.PARTNO_Trust = true; + } + + //ignore batch value + if (PUB.Result.vModel.IgnoreBatch == true) + { + + } + + } + + //기본 벤더이름 + void BCDProcess_DefVenderName(Class.JobData itemC) + { + //기본 벤더이름 + var defname = PUB.Result.vModel.Def_Vname ?? string.Empty; + if (PUB.Result.isSetvModel && defname.isEmpty() == false) + { + if (itemC.VisionData.VNAME.Equals(defname) == false) + { + itemC.VisionData.VNAME = defname.Trim(); + itemC.VisionData.VNAME_Trust = true; + PUB.log.Add($"Defaul V.Name Set to {defname}"); + } + } + else if (PUB.OPT_BYPASS() == true) + { + if (itemC.VisionData.VNAME_Trust == false) + { + itemC.VisionData.VNAME = "BYPASS"; + itemC.VisionData.VNAME_Trust = true; + } + } + } + + //기본 MFG + void BCDProcess_DefMFGDate(Class.JobData itemC) + { + var defname = PUB.Result.vModel.Def_MFG ?? string.Empty; + if (PUB.Result.isSetvModel && defname.isEmpty() == false && itemC.VisionData.MFGDATE.Equals(defname) == false) + { + itemC.VisionData.MFGDATE = defname.Trim(); + itemC.VisionData.MFGDATE_Trust = true; + PUB.log.Add($"Defaul MFGDATE Set to {defname}"); + } + } + + //[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음) + //[WMS] 에서 중복검색되면 팝업을 해야하므로 이것을 먼저 처리한다. + (bool NewBarcodeUpdated, EResultKeyence retval) BCDProcess_FindWMSInfo(Class.JobData itemC) + { + Boolean Apply = true; + var vdata = itemC.VisionData; + bool NewBarcodeUpdated = false; + EResultKeyence rlt = EResultKeyence.Wait; + + //select columns + List fields = new List(); + if (VAR.BOOL[eVarBool.Opt_WMS_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUST_CODE"); + if (VAR.BOOL[eVarBool.Opt_WMS_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PART_NO"); + if (VAR.BOOL[eVarBool.Opt_WMS_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VENDOR_NM"); + if (VAR.BOOL[eVarBool.Opt_WMS_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); + if (VAR.BOOL[eVarBool.Opt_WMS_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_WMS_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUST_CODE='{vdata.CUSTCODE.PadLeft(10, '0')}'"); + else Apply = false; + } + if (Apply && VAR.BOOL[eVarBool.Opt_WMS_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_WMS_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_WMS_Where_VLOT]) //221013 + { + if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VENDOR_LOT = '{vdata.VLOT}'"); + else Apply = false; + } + + //if query data . no error + if (Apply && fields.Count > 0 && wheres.Count > 0) + { + 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; + rlt = 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; + } + + } + return (NewBarcodeUpdated, rlt); + } + + //SID정보테이블에서 정보 추출 + bool BCDProcess_FindSIDInfo(Class.JobData itemC) + { + Boolean Apply = true; + bool NewBarcodeUpdated = false; + var vdata = itemC.VisionData; + + //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 (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); + else Apply = false; + } + 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 (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($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')"); + else Apply = false; + } + + if (Apply && VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006 + { + if (AR.SETTING.Data.McName.isEmpty() == false) + wheres.Add($"attach='{AR.SETTING.Data.McName}'"); + else Apply = false; + } + + //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) + { + if (PUB.GetSIDInfo_And_SetData(fields, ref vdata, SQL, SQLC) == true) + NewBarcodeUpdated = true; + + PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL; + } + } + return NewBarcodeUpdated; + } + + //시드변환정보에서 정보 추출 + bool BCDProcess_FindSIDConv(Class.JobData itemC) + { + Boolean Apply = true; + bool NewBarcodeUpdated = false; + var vdata = itemC.VisionData; + + //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 (Apply && VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode]) + { + if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE.PadLeft(10, '0')}'"); + 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; + } + + + //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; + } + } + return NewBarcodeUpdated; + } + + //기존 작업에서 데이터를 찾아서 쓴다 + bool BCDProcess_FindJobData(Class.JobData itemC) + { + bool NewBarcodeUpdated = false; + Boolean Apply = true; + var vdata = itemC.VisionData; + + //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.PadLeft(10, '0')}'"); + 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; + } + } + return NewBarcodeUpdated; + } + + void BCDProcess_SIDConvert(Class.JobData itemC) + { + var vdata = itemC.VisionData; + //원본시드(sid0)가 비어있는데 sid과 확정되었다면 변환작업을 진행한다 + if (vdata.SID0.isEmpty() && vdata.SID.isEmpty() == false && vdata.SID_Trust) + { + //이 sid가 존재여부확인 후 없는 sid라면 더이상 처리하지 않는다 230510 + if (PUB.Result.DTSidConvertEmptyList.Contains(vdata.SID)) + { + //존재하지 않는 SID로 이미 확인되었다 + } + else if (PUB.Result.DTSidConvertMultiList.Contains(vdata.SID)) + { + //다중sid로 인해 처리하지 않는다 + } + else + { + var newsid = PUB.SIDCovert(vdata.SID, "SPS_BarcodeProcess", out bool converr); + if (converr) + { + if (PUB.sm.Step == eSMStep.RUN) + PUB.log.AddE(newsid); + } + else + { + vdata.SID0 = vdata.SID; + vdata.SID = newsid; + } + } + } + } + //Generate Reel ID + void BCDProcess_MakeReelID(Class.JobData itemC) + { + if (itemC.VisionData.RIDNew == false && itemC.VisionData.SID.isEmpty() == false) + { + var newid = PUB.MakeNewREELID(itemC.VisionData.SID);// Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD(itemC.VisionData.CUSTCODE, "4", "A", out string errmsg); + if (newid.success == true) + { + //backup origin reel id + itemC.VisionData.RID0 = itemC.VisionData.RID; + + //set new reel id + PUB.log.Add("new reelid bacodeprecess"); + itemC.VisionData.SetRID(newid.newid, "SPS:CHKDATACOMPLETE");// = newid; + itemC.VisionData.RIDNew = true; //applied new reel id + + //서버의수량업데이트기능이 켜져있다면 해당 값을 제거해준다. (다시 조회되도록 함) + if (VAR.BOOL[eVarBool.Opt_ServerQty]) + { + //이미 수량업데이트된 경우이므로 복원시켜준다 + if (itemC.VisionData.QTY0.isEmpty() == false) + { + PUB.log.AddAT($"릴아이디 변경으로 인해 수량을 복원합니다({itemC.VisionData.QTY}->{itemC.VisionData.QTY0})"); + itemC.VisionData.QTY = itemC.VisionData.QTY0; + itemC.VisionData.QTY0 = string.Empty; + } + } + } + else + { + var logtime = VAR.TIME.RUN((int)eVarTime.LOG_NEWIDERROR); + if (logtime.TotalSeconds >= 3000) + { + PUB.log.AddAT($"Reel_ID 생성실패 : {newid.message}"); + VAR.TIME.Update(eVarTime.LOG_NEWIDERROR); + } + } + } + } + } +} \ No newline at end of file diff --git a/Handler/Project/Util/Util.cs b/Handler/Project/Util/Util.cs deleted file mode 100644 index b536de8..0000000 --- a/Handler/Project/Util/Util.cs +++ /dev/null @@ -1,191 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using System.Data; -//using System.Diagnostics; -//using System.Drawing; -//using System.IO; -//using System.Linq; -//using System.Management; -//using System.Net; -//using System.Net.NetworkInformation; -//using System.Runtime.Serialization.Formatters.Binary; -//using System.Text; -//using System.Windows.Forms; - -//namespace Project -//{ - -// public static partial class UTIL -// { - - - - - - -// //public static Boolean SendMail(string title, string body, string from, string[] tolist, string file = "") -// //{ -// // //메일을 전송하고 나간다 -// // Chilkat.MailMan mailman = new Chilkat.MailMan(); -// // bool success = mailman.UnlockComponent("BLUPRT.CBX012020_rzDFf7pQAsCS"); -// // if (success != true) -// // { -// // UTIL.MsgE("메일 전송이 실패되었습니다\n잠시 후 다시 시도하세요", true); -// // return false; -// // } -// // else -// // { -// // mailman.SmtpHost = "10.101.10.6"; -// // mailman.SmtpPort = 25; -// // Chilkat.Email email = new Chilkat.Email(); -// // email.Subject = title; -// // //email.Body = this.textBox1.Text; -// // email.SetHtmlBody(body.Replace("\r", "").Replace("\n", "
")); -// // email.From = from; - -// // foreach (var to in tolist) -// // email.AddTo(to.Substring(0, to.IndexOf('@')), to); - -// // if (System.IO.File.Exists(file)) -// // email.AddFileAttachment(file); - -// // success = mailman.SendEmail(email); -// // if (success != true) -// // { -// // UTIL.MsgE("발송 실패", true); -// // return false; -// // } - -// // success = mailman.CloseSmtpConnection(); -// // if (success != true) -// // { -// // UTIL.MsgE("Connection to SMTP server not closed cleanly.", true); -// // return false; -// // } -// // } - -// // return true; -// //} - - -// //public static string JobListToFile(Class.CHistoryJOB data, string jobdate, string jobseq, out int cnt) -// //{ -// // cnt = 0; -// // if (string.IsNullOrEmpty(jobdate)) return string.Empty; -// // //이미저장된 목록을 가져오고 중복된것은 피한다 -// // var preSavedFile = System.IO.Path.Combine(COMM.SETTING.Data.Path_Data, "JobData", jobdate.Substring(0, 6), jobdate + "-" + jobseq + ".txt"); -// // List preList = new List(); -// // if (System.IO.File.Exists(preSavedFile)) preList.AddRange(System.IO.File.ReadAllLines(preSavedFile, System.Text.Encoding.UTF8)); - -// // //Temp -// // var fiName = System.IO.Path.Combine(COMM.SETTING.Data.Path_Data, "UploadTemp", jobdate + "_" + jobseq + ".tab"); -// // var fi = new System.IO.FileInfo(fiName); -// // if (fi.Directory.Exists == false) fi.Directory.Create(); -// // var sb = new System.Text.StringBuilder(); - -// // sb.AppendLine("#Time\tSID\tRID\tRAW"); -// // var oklist = data.Items.Where(t => t.VisionData.RID.isEmpty() == false).ToArray(); -// // foreach (var item in oklist) -// // { -// // //기존에 전송한 목록에 없어야 한다 -// // if (item.error == Class.JobData.ErrorCode.None && item.VisionData.RID.isEmpty() == false) -// // { -// // sb.AppendLine(string.Format("{0}\t{1}\t{2}\t{3}", -// // item.JobStart.ToString("yyyy-MM-dd HH:mm:sss"), item.VisionData.SID, item.VisionData.RID, item.VisionData.QROutRaw)); -// // cnt += 1; -// // } -// // } -// // try -// // { -// // System.IO.File.WriteAllText(fi.FullName, sb.ToString(), System.Text.Encoding.UTF8); -// // return fi.FullName; -// // } -// // catch (Exception ex) -// // { -// // PUB.log.AddE("JobListToFile:" + ex.Message); -// // return string.Empty; -// // } -// //} - -// //public static bool SendMail(string seqdate, string seqno) -// //{ -// // Chilkat.MailMan mailman = new Chilkat.MailMan(); -// // bool success = mailman.UnlockComponent("BLUPRT.CBX012020_rzDFf7pQAsCS"); -// // if (success != true) -// // { -// // Debug.WriteLine(mailman.LastErrorText); -// // return false; -// // } - -// // mailman.SmtpHost = "10.101.10.6"; - -// // mailman.SmtpPort = 25; - -// // // Create a new email object -// // Chilkat.Email email = new Chilkat.Email(); - -// // var mailform = PUB.mailForm.FirstOrDefault(); -// // if (mailform == null) -// // return false; - - - -// // var subject = mailform.subject.Trim(); -// // subject = subject.Replace("{seqdate}", seqdate); -// // subject = subject.Replace("{seqno}", seqno); - - -// // var buffer = System.IO.File.ReadAllText(UTIL.CurrentPath + "\\Mailform.html"); - -// // //시드별집계데이터생성 -// // System.Text.StringBuilder sbFileSID = new StringBuilder(); -// // System.Text.StringBuilder sbFileREEL = new StringBuilder(); -// // sbFileSID.AppendLine(string.Format("NO,SID,작업수량,예정수량,UNIT")); -// // sbFileREEL.AppendLine(string.Format("NO,SID,REEL,QTY,TIME")); - -// // // int cntrid = 1; - -// // System.IO.File.WriteAllText(UTIL.CurrentPath + "\\result_sidsummary.csv", sbFileSID.ToString(), System.Text.Encoding.Default); -// // System.IO.File.WriteAllText(UTIL.CurrentPath + "\\result_reelist.csv", sbFileREEL.ToString(), System.Text.Encoding.Default); - -// // //메일본문의 내용 치환 -// // var contents = buffer.Trim(); -// // contents = contents.Replace("{seqdate}", seqdate); -// // contents = contents.Replace("{seqno}", seqno); - -// // email.Subject = subject; -// // email.SetHtmlBody(contents); -// // email.From = "ReelSorter"; -// // email.AddFileAttachment(UTIL.CurrentPath + "\\result_sidsummary.csv"); -// // email.AddFileAttachment(UTIL.CurrentPath + "\\result_reelist.csv"); - - -// // System.Text.StringBuilder maillist = new StringBuilder(); -// // foreach (DataSet1.MailRecipientRow r in PUB.mailList.Rows) -// // { -// // success = email.AddTo(r.Name, r.Address); -// // maillist.Append(string.Format("{0}({1})", r.Name, r.Address)); -// // } - - -// // success = mailman.SendEmail(email); -// // if (success != true) -// // { -// // Debug.WriteLine(mailman.LastErrorText); -// // return false; -// // } - -// // success = mailman.CloseSmtpConnection(); -// // if (success != true) -// // { -// // Debug.WriteLine("Connection to SMTP server not closed cleanly."); -// // PUB.log.AddE("메일 발송 실패(" + maillist.ToString() + ")"); -// // } - -// // PUB.log.AddI("메일 발송 완료(" + maillist.ToString() + ")"); -// // return true; -// //} - - -// } -//} diff --git a/Handler/Project/fMain.Designer.cs b/Handler/Project/fMain.Designer.cs index 3d3d081..82b4294 100644 --- a/Handler/Project/fMain.Designer.cs +++ b/Handler/Project/fMain.Designer.cs @@ -1661,7 +1661,7 @@ this.toolStripMenuItem16, this.getImageToolStripMenuItem}); this.cmDebug.Name = "cmVision"; - this.cmDebug.Size = new System.Drawing.Size(256, 590); + this.cmDebug.Size = new System.Drawing.Size(256, 612); // // inboundToolStripMenuItem // @@ -1760,7 +1760,7 @@ // this.dIOMonitorToolStripMenuItem.Name = "dIOMonitorToolStripMenuItem"; this.dIOMonitorToolStripMenuItem.Size = new System.Drawing.Size(255, 22); - this.dIOMonitorToolStripMenuItem.Text = "new barcode"; + this.dIOMonitorToolStripMenuItem.Text = "Test Barcode Process"; this.dIOMonitorToolStripMenuItem.Click += new System.EventHandler(this.dIOMonitorToolStripMenuItem_Click); // // refreshControklToolStripMenuItem @@ -2297,7 +2297,7 @@ // this.모델선택ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40; this.모델선택ToolStripMenuItem.Name = "모델선택ToolStripMenuItem"; - this.모델선택ToolStripMenuItem.Size = new System.Drawing.Size(176, 46); + this.모델선택ToolStripMenuItem.Size = new System.Drawing.Size(174, 46); this.모델선택ToolStripMenuItem.Text = "Work Model"; this.모델선택ToolStripMenuItem.Click += new System.EventHandler(this.ModelSelectionToolStripMenuItem_Click); // @@ -2305,20 +2305,20 @@ // this.btModelMot.Image = global::Project.Properties.Resources.Motor; this.btModelMot.Name = "btModelMot"; - this.btModelMot.Size = new System.Drawing.Size(176, 46); + this.btModelMot.Size = new System.Drawing.Size(174, 46); this.btModelMot.Text = "Motion Model"; this.btModelMot.Click += new System.EventHandler(this.toolStripMenuItem23_Click); // // toolStripMenuItem12 // this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(173, 6); + this.toolStripMenuItem12.Size = new System.Drawing.Size(171, 6); // // 바코드룰ToolStripMenuItem // this.바코드룰ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_add_40; this.바코드룰ToolStripMenuItem.Name = "바코드룰ToolStripMenuItem"; - this.바코드룰ToolStripMenuItem.Size = new System.Drawing.Size(176, 46); + this.바코드룰ToolStripMenuItem.Size = new System.Drawing.Size(174, 46); this.바코드룰ToolStripMenuItem.Text = "Barcode Rule"; this.바코드룰ToolStripMenuItem.Click += new System.EventHandler(this.BarcodeRuleToolStripMenuItem_Click); // @@ -2329,7 +2329,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(176, 46); + this.sID정보ToolStripMenuItem.Size = new System.Drawing.Size(174, 46); this.sID정보ToolStripMenuItem.Text = "SID Info"; // // 프로그램열기ToolStripMenuItem diff --git a/Handler/Project/fMain.cs b/Handler/Project/fMain.cs index 51c4150..b50ddc0 100644 --- a/Handler/Project/fMain.cs +++ b/Handler/Project/fMain.cs @@ -1085,9 +1085,49 @@ namespace Project private void dIOMonitorToolStripMenuItem_Click(object sender, EventArgs e) { - var sid = UTIL.InputBox("input sid"); - if (sid.Item1 == false || sid.Item2.isEmpty()) return; - var c = PUB.MakeNewREELID(sid.Item2);// Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD("2000", "4", "A", out string error); + using (var f = new fManualPrint0()) + { + f.Text = "Barcode Process Test"; + if (f.ShowDialog() == DialogResult.OK) + { + var reelinfo = f.reelinfo; + var vdata = new Class.JobData(9); + PUB.Result.ItemDataC.CopyTo(ref vdata); + vdata.Clear("TEST"); + vdata.VisionData.BarcodeTouched = true; + if (reelinfo.SID.isEmpty() == false) + { + vdata.VisionData.SID = reelinfo.SID; + vdata.VisionData.SID_Trust = true; + } + if (reelinfo.venderLot.isEmpty() == false) + { + vdata.VisionData.VLOT = reelinfo.venderLot; + vdata.VisionData.VLOT_Trust = true; + } + if (reelinfo.id.isEmpty() == false) + { + vdata.VisionData.SetRID(reelinfo.id,"TEST"); + vdata.VisionData.RID_Trust = true; + } + if(reelinfo.mfg.isEmpty()==false) + { + vdata.VisionData.MFGDATE = reelinfo.mfg; + vdata.VisionData.MFGDATE_Trust = true; + } + if(reelinfo.qty > 0) + { + vdata.VisionData.QTY = reelinfo.qty.ToString(); + vdata.VisionData.QTY_Trust = true; + } + //vdata.VisionData.VLOT = reelinfo.venderLot; + + BCDProcess_ALL(vdata, "TEST", true); + var msg = vdata.VisionData.ToString(); + PUB.log.Add(msg); + UTIL.MsgE(msg); + } + } } private void refreshControklToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Handler/Project/fMain.resx b/Handler/Project/fMain.resx index 6d1deaf..9abc638 100644 --- a/Handler/Project/fMain.resx +++ b/Handler/Project/fMain.resx @@ -473,16 +473,16 @@ If pressed while motion is moving, motion will also stop. iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIUSURBVGhD7ZPNShthFIbHG2jvIZDurN6BuquKkO7qroKg - FCoVpAxWiESKtT9YF1FjqZlpCmNGSzTS3oB6Ay1tN+2iKum23WaR03z4hpnMnA8KmUkOOA88uznf+2QR - IyEh4Rpx93djPFOrX2ZqRHE4UatfZGqNUcxFz9UAPx6d9XPMRQ8/GL2Yix5uLA4xFz3cWBxiLiIWvp4Z - j7+TkhuLw9aesfDtBBUd0HqsFz9A2TG+x7ixOPRvoqIDfI9xY3Ho30RFB/ge48bi0L+Jiv9nzsyNzZq5 - i4dmjiR51bRyB5l6JMa3fGDmfiFTD3coSWTq4Y4kiUw93JEkkamHO5IkMvVwR5JEpp7gwb37M9R/e4DS - 6XRXVZuTU7NtLUpk6gke9CK+Zf/AYFuLEpl6ggfcw9002INMPcED7tFuGuxBpp7pOZP8plKpnhrsQWYY - 2/l4yypXz5qS7R6LFG2nqhXZHio+eCDYU2R77Lgf/jIfCrX6B9keRffwC/+xQJ3qZ2R7WHvH79iPJVo+ - spHt0fwPzLMfy/QRsj2KTmXYKh81/+nytcvVIWR7lEqfbrzMv23sOhWSrGosuO5NZLdTsPd+vnl/QKIt - 7f9Abpj8rnOwWXRIuPvIDbNeKD55XbBItNvWInLDrG3kR55tbJFkV9e3hpEbhoj6lp6+OMxms43l1Vck - SdW0uPK8ohqRm5CQkJBw7TGMf4X/txh/Rwb1AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIUSURBVGhD7ZPBShtRFIanL6DvEIg7a99Au7OWQrqzuxYE + pVBREBlsIRIptpWigtamFTNjCmNGSzSiL1B9gZbqxi5aS7ptt1nkmIt/mMnMuVDITHLA+eDbzbn/l0WM + hISEG8TDP/X7mWrtd6ZKFIcPqrXLTLV+D3PRcz3Aj0dn7RfmoocfjF7MRQ83FoeYix5uLA4xFxEz30+N + 2XNScmNx2NwzZs6+oKINmo914wco28b3GDcWh/5NVLSB7zFuLA79m6hoA99j3Fgc+jdR8f9MmrmRCTN3 + +czMkSSvmxaGkalHYnzTp2buJzL1cIeSRKYe7kiSyNTDHUkSmXq4I0kiUw93JElk6gkejD4ep/7bA5RO + pzuq2nz0ZKKlRYlMPcGDbsQ37R+409KiRKae4AH3cCcN9iBTT/CAe7STBnuQqWds0iS/qVSqqwZ7kBnG + do76rFLltCHZ7qFI0XaiWpHtoeKDB4I9QbbHB/fzP+ZDoVb+Ituj4O5/4z8WqFP5imwPa+dwm/1YoqUD + G9kejf/ANPuxTKeQ7VFwykNW6aDxT5evXaoMItujWDzuWVrbrG85ZZKsasy7bi+yW8nbOz8+ftoj0RZ3 + L5AbZn3L2XtXcEi4u8gNs5wvPF/JWyTa99YccsO8Xl2/+2p1gyS7uLwxhNwwRHTrxcul/Ww2W59ffEuS + VE1zC2/KqhG5CQkJCQk3HsO4AkjrtxJUp20UAAAAAElFTkSuQmCC diff --git a/Handler/Sub/CommData/Enum.cs b/Handler/Sub/CommData/Enum.cs index b8de038..8f22158 100644 --- a/Handler/Sub/CommData/Enum.cs +++ b/Handler/Sub/CommData/Enum.cs @@ -82,10 +82,27 @@ namespace AR Option_AutoConf, Opt_SIDConvert, Opt_ApplySIDConv, + Opt_ApplyWMSInfo, Opt_ApplySIDInfo, Opt_ApplyJobInfo, Opt_CheckSIDExist, + + + Opt_WMS_Apply_PartNo, + Opt_WMS_Apply_CustCode, + Opt_WMS_Apply_SID, + Opt_WMS_Apply_VenderName, + Opt_WMS_Apply_batch, + Opt_WMS_Apply_qty, + Opt_WMS_Where_PartNo, + Opt_WMS_Where_CustCode, + Opt_WMS_Where_SID, + Opt_WMS_Where_VLOT, + Opt_WMS_Where_MC, + Opt_WMS_WriteServer, + + Opt_SID_Apply_PartNo, Opt_SID_Apply_CustCode, Opt_SID_Apply_SID, diff --git a/Handler/swPLC b/Handler/swPLC index 9ad2f4e..e583341 160000 --- a/Handler/swPLC +++ b/Handler/swPLC @@ -1 +1 @@ -Subproject commit 9ad2f4e355486b6e6299b0ba3861398e994f1f98 +Subproject commit e583341e5341be839379d1922b2650632c032dc5