diff --git a/Handler/Project/Dialog/fLoaderInfo.cs b/Handler/Project/Dialog/fLoaderInfo.cs index b2710a1..97a3063 100644 --- a/Handler/Project/Dialog/fLoaderInfo.cs +++ b/Handler/Project/Dialog/fLoaderInfo.cs @@ -33,7 +33,12 @@ namespace Project.Dialog foreach (var item in errlist) AddErrorMessage(item); } - + if (PUB.Result.vModel.IgnoreBatch) tbBatch.Enabled = false; + if (PUB.Result.vModel.IgnorePartNo) tbpartno.Enabled = false; + linkLabel7.Enabled = tbpartno.Enabled; + button4.Enabled = tbpartno.Enabled; + btPartChk.Enabled = tbpartno.Enabled; + lnkBatch.Enabled = tbBatch.Enabled; } void AddErrorMessage(string msg) @@ -683,7 +688,7 @@ namespace Project.Dialog //최근 6시간안에서 동일한 데이터를 찾아서 제안 해준다 var sd = DateTime.Now.AddHours(-1); - var sql = "select * from K4EE_Component_Reel_Result with (no lock)" + + var sql = "select * from K4EE_Component_Reel_Result with (nolock)" + " where jtype = @jtype and sid = @sid and isnull(QR,'') <> '' and stime >= @sd" + " order by wdate desc"; var ps = new SqlParameter[] { @@ -992,9 +997,9 @@ namespace Project.Dialog //WMS generates from DB var newid = PUB.MakeNewREELID(sid); - if (newid.success==false) + if (newid.success == false) { - UTIL.MsgE($"No ReelID Data\n{newid.message}" , true); + UTIL.MsgE($"No ReelID Data\n{newid.message}", true); return; } @@ -1416,7 +1421,7 @@ namespace Project.Dialog tbRID.Focus(); return; } - if (this.tbpartno.Text.isEmpty()) + if (PUB.Result.vModel.IgnorePartNo == false && this.tbpartno.Text.isEmpty()) { UTIL.MsgE("PART No is not entered"); tbpartno.Focus(); @@ -2077,7 +2082,7 @@ namespace Project.Dialog //데이터베이스 결과에서 자료를 추가한다. var result = new DataSet1.K4EE_Component_Reel_ResultDataTable();// new List(); - var tabName = "K4EE_Component_Reel_Result with (no lock)"; + var tabName = "K4EE_Component_Reel_Result with (nolock)"; //1.sid sid를 먼저 검색한다. 이것이 확률이 제일 높음 if (this.tbSID.Text.isEmpty() == false) diff --git a/keyence_front.ptc b/keyence_front.ptc new file mode 100644 index 0000000..98d9793 Binary files /dev/null and b/keyence_front.ptc differ diff --git a/keyence_rear.ptc b/keyence_rear.ptc new file mode 100644 index 0000000..316ca98 Binary files /dev/null and b/keyence_rear.ptc differ