This commit is contained in:
ChiKyun Kim
2025-09-23 15:41:16 +09:00
parent 02028afc27
commit b037dd53e6
74 changed files with 4269 additions and 7917 deletions

View File

@@ -23,7 +23,6 @@ namespace Project
public List<Class.RegexPattern> BCDPattern;
public List<Class.RegexPattern> BCDIgnorePattern;
public List<Class.RegexPattern> BCDPrintPattern;
public DateTime ResetButtonDownTime = DateTime.Now;
public Boolean ClearAllSID = false;
@@ -191,16 +190,11 @@ namespace Project
public DateTime[] doCheckTime = new DateTime[256];
public Boolean isError { get; set; }
// public Boolean isMarkingMode { get; set; }
public int retry = 0;
public DateTime retryTime;
public DateTime[] WaitForVar = new DateTime[255];
public int JoystickAxisGroup = 0;
public int ABCount = 0;
public CResult()
{
mModel = new ModelInfoM();
@@ -209,7 +203,6 @@ namespace Project
SIDReference = new Class.CHistorySIDRef();
SIDHistory = new DataSet1.SIDHistoryDataTable();
BCDPattern = new List<Class.RegexPattern>();
BCDPrintPattern = new List<Class.RegexPattern>();
OUTHistory = new List<UIControl.CItem>();
this.Clear("Result ctor");

View File

@@ -1,275 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using HidSharp;
using HidSharp.Reports;
using HidSharp.Reports.Encodings;
namespace arDev.Joystick
{
public class JoystickRaw : IDisposable
{
HidDevice _dev;
HidStream _hidStream;
public Boolean IsOpen { get; private set; }
public event EventHandler Disconnected;
public event EventHandler Connected;
public event EventHandler Changed;
public delegate void MessageHandler(string msg);
public event MessageHandler Message;
public int InputLength { get; private set; }
public int OutputLength { get; private set; }
public int FeatureLength { get; private set; }
public int vid { get; set; }
public int pid { get; set; }
public Boolean[] Buttons = new bool[64]; //버튼정보를 기록한다
Boolean bListUpdate = false;
public JoystickRaw()
{
vid = -1;
pid = -1;
this.InputLength = 0;
this.OutputLength = 0;
this.FeatureLength = 0;
this.IsOpen = false;
this._dev = null;
this._hidStream = null;
DeviceList.Local.Changed += Local_Changed;
Job = new Task(JobMain, ct);
Job.Start();
for (int i = 0; i < Buttons.Length; i++)
Buttons[i] = false;
}
CancellationToken ct ;
public IEnumerable<HidDevice> GetHidDevices()
{
return DeviceList.Local.GetHidDevices();
}
public void Connect(int vid, int pid)
{
this.vid = vid;
this.pid = pid;
}
public void Connect(HidDevice device)
{
this.vid = device.VendorID;
this.pid = device.ProductID;
}
Task Job = null;
private bool disposed = false;
DateTime LastConnTime = DateTime.Now;
void JobMain()
{
//개체가 소멸하기전까지 진행한다
while (this.disposed == false)
{
if (IsOpen == false)
{
if (this.vid == -1 || this.pid == -1)
{
//아직설정되지 않았으니 대기를한다
System.Threading.Thread.Sleep(3000);
}
else
{
//연결작업을 시작해야한다
if (bListUpdate || (DateTime.Now - LastConnTime).TotalMilliseconds >= 3000)
{
LastConnTime = DateTime.Now;
//연결작업
var list = this.GetHidDevices();
this._dev = list.Where(t => t.VendorID == this.vid && t.ProductID == this.pid).FirstOrDefault();
if (_dev != null)
{
try
{
IsOpen = _dev.TryOpen(out _hidStream);
if (IsOpen)
{
this.InputLength = _dev.GetMaxInputReportLength();
this.OutputLength = _dev.GetMaxOutputReportLength();
this.FeatureLength = _dev.GetMaxFeatureReportLength();
this._hidStream.ReadTimeout = Timeout.Infinite;
Connected?.Invoke(this, null);
var rawReportDescriptor = _dev.GetRawReportDescriptor();
var msg = ("Report Descriptor:");
msg += string.Format(" {0} ({1} bytes)", string.Join(" ", rawReportDescriptor.Select(d => d.ToString("X2"))), rawReportDescriptor.Length);
Message?.Invoke(msg);
}
else
{
if (this._hidStream != null) this._hidStream.Dispose();
}
}
catch { System.Threading.Thread.Sleep(1500); }
}
else System.Threading.Thread.Sleep(1500);
}
else System.Threading.Thread.Sleep(1500);
}
}
else
{
//데이터를 가지고 온다
using (_hidStream)
{
try
{
reportDescriptor = _dev.GetReportDescriptor();
deviceItem = reportDescriptor.DeviceItems[0];
var inputReportBuffer = new byte[_dev.GetMaxInputReportLength()];
var inputReceiver = reportDescriptor.CreateHidDeviceInputReceiver();
var inputParser = deviceItem.CreateDeviceItemInputParser();
inputReceiver.Start(_hidStream);
while (true)
{
if (!inputReceiver.IsRunning) { break; } // Disconnected?
Report report; //
while (inputReceiver.TryRead(inputReportBuffer, 0, out report))
{
if (inputParser.TryParseReport(inputReportBuffer, 0, report))
{
WriteDeviceItemInputParserResult(inputParser);
}
}
System.Threading.Thread.Sleep(20);
}
inputReceiver = null;
IsOpen = false;
}
catch (Exception ex)
{
Message?.Invoke(ex.Message);
}
finally
{
Disconnected?.Invoke(this, null);
IsOpen = false;
}
}
}
}
}
void WriteDeviceItemInputParserResult(HidSharp.Reports.Input.DeviceItemInputParser parser)
{
while (parser.HasChanged)
{
int changedIndex = parser.GetNextChangedIndex();
var previousDataValue = parser.GetPreviousValue(changedIndex);
var dataValue = parser.GetValue(changedIndex);
var oVal = previousDataValue.GetPhysicalValue();
var nVal = dataValue.GetPhysicalValue();
if (double.IsNaN(oVal)) oVal = 0.0;
if (double.IsNaN(nVal)) nVal = 0.0;
var InputMethod = (Usage)dataValue.Usages.FirstOrDefault();
if (InputMethod.ToString().StartsWith("Button"))
{
var butNo = int.Parse(InputMethod.ToString().Substring(6));
this.Buttons[butNo - 1] = nVal > 0; //버튼값은 기록 210107
}
//이벤트발생
InputChanged?.Invoke(this, new InputChangedEventHandler(
InputMethod, oVal, nVal));
//메세지도 발생함
//var msg = (string.Format(" {0}: {1} -> {2}",
// (Usage)dataValue.Usages.FirstOrDefault(),
// previousDataValue.GetPhysicalValue(),
// dataValue.GetPhysicalValue()));
//Message?.Invoke(msg);
}
}
public event EventHandler<InputChangedEventHandler> InputChanged;
public class InputChangedEventHandler : EventArgs
{
public Usage input { get; set; }
public double oldValue { get; set; }
public double newValue { get; set; }
public InputChangedEventHandler(Usage input_, double oValue_, double nValue_)
{
this.input = input_;
this.oldValue = oValue_;
this.newValue = nValue_;
}
}
ReportDescriptor reportDescriptor;
DeviceItem deviceItem;
~JoystickRaw()
{
Dispose(false);
}
public void Dispose()
{
Dispose(true);
// This object will be cleaned up by the Dispose method.
// Therefore, you should call GC.SupressFinalize to
// take this object off the finalization queue
// and prevent finalization code for this object
// from executing a second time.
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
// Check to see if Dispose has already been called.
if (!this.disposed)
{
// If disposing equals true, dispose all managed
// and unmanaged resources.
if (disposing)
{
// Dispose managed resources.
this._dev = null;
}
Job.Wait();
Job.Dispose();
// Call the appropriate methods to clean up
// unmanaged resources here.
// If disposing is false,
// only the following code is executed.
//CloseHandle(handle);
//handle = IntPtr.Zero;
// Note disposing has been done.
DeviceList.Local.Changed -= Local_Changed;
disposed = true;
}
}
private void Local_Changed(object sender, DeviceListChangedEventArgs e)
{
Changed?.Invoke(sender, e);
bListUpdate = true;
}
}
}

View File

@@ -4,7 +4,6 @@ using System.Linq;
using System.Text;
using System.Drawing;
using System.ComponentModel;
using System.Web.Services.Protocols;
using AR;
namespace Project

View File

@@ -41,6 +41,7 @@ namespace Project
public bool DisablePrinter { get; set; }
public bool CheckSIDExsit { get; set; }
public bool bOwnZPL { get; set; }
public int BSave { get; set; }
@@ -70,6 +71,7 @@ namespace Project
this.DisableCamera = dr.DisableCamera;
this.DisablePrinter = dr.DisablePrinter;
this.CheckSIDExsit = dr.CheckSIDExsit;
this.BSave = dr.BSave;
//this.ByPassSID = dr.ByPassSID;
}
public bool WriteValue()
@@ -98,7 +100,7 @@ namespace Project
dr.DisablePrinter = this.DisablePrinter;
dr.CheckSIDExsit = this.CheckSIDExsit;
dr.bOwnZPL = this.bOwnZPL;
dr.BSave = this.BSave;
dr.EndEdit();
PUB.mdm.SaveModelV();
return true;

View File

@@ -1,109 +0,0 @@
using AR;
using Microsoft.SqlServer.Server;
using Newtonsoft.Json.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace Project.Controller
{
public class ModelController : ApiController
{
//private static List<Item> _values = new List<Item> {
// new Item { Id = 1, Name = "USB2.0 Extension Cable" },
// new Item { Id = 2, Name = "USB3.0 Extension Cable" },
// new Item { Id =3, Name = "USB3.1 Extension Cable" }
//};
// GET api/values
public IHttpActionResult Get()
{
HttpResponseMessage responsem = new HttpResponseMessage(HttpStatusCode.OK);
var data = new
{
model = PUB.Result.vModel.Title,
};
return Ok(data);
}
// GET api/values/5
public IHttpActionResult Get(int id)
{
//var value = DataManager.Items?.Find(v => v.Id == id) ?? null;
//if (value == null)
//{
// return NotFound();
//}
return Ok();
}
// POST api/values
[HttpGet]
public IHttpActionResult Set(string id)
{
//Change to specified model.
var msg = "";
if (id.isEmpty()) msg = "NO MODELNAME";
if (msg.isEmpty())
{
if (PUB.sm.Step == eSMStep.IDLE || PUB.sm.Step == eSMStep.FINISH)
{
var buf = id.Split(new char[] { '|' }, System.StringSplitOptions.RemoveEmptyEntries);
var modelname = buf[0];
var conv = true;
if (buf.Length == 2) conv = buf[1] == "1";
var modelVision = PUB.mdm.GetDataV(modelname);
if (modelVision == null)
{
msg = "NO MODELDATA";
}
else
{
VAR.BOOL[eVarBool.Use_Conveyor] = conv;
var rlt = PUB.SelectModelV(modelname, false);
if (rlt == false)
{
msg = "[OP]LOAD FAIL";
}
else
{
var motion = conv ? "Conveyor" : "Default";
rlt = PUB.SelectModelM("Conveyor");
if(rlt ==false)
{
msg = "[MT]LOAD FAIL";
}
}
}
}
else
{
msg = "NOT IDLE";
}
}
var data = new
{
Message = msg,
Result = (msg.isEmpty() ? true : false),
};
return Ok(data);
}
// PUT api/values/5
public IHttpActionResult Put(int id, [FromBody] JObject value)
{
return Ok();
}
// DELETE api/values/5
public IHttpActionResult Delete(int id)
{
return Ok();
}
}
}

View File

@@ -1,88 +0,0 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Runtime.Remoting.Contexts;
using System.Security.Principal;
using System.Text;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using System.Web.Http.Results;
namespace Project.Controller
{
public class StateController : ApiController
{
//private static List<Item> _values = new List<Item> {
// new Item { Id = 1, Name = "USB2.0 Extension Cable" },
// new Item { Id = 2, Name = "USB3.0 Extension Cable" },
// new Item { Id =3, Name = "USB3.1 Extension Cable" }
//};
// GET api/values
public IHttpActionResult Get()
{
HttpResponseMessage responsem = new HttpResponseMessage(HttpStatusCode.OK);
//responsem.Headers.Add("Content-Type", "application/json");
//ResponseMessageResult response = new ResponseMessageResult(responsem);
//return response;
//return this.Content(HttpStatusCode.OK, _values, mediaType)
return Ok();
//string json = JsonConvert.SerializeObject(_values, Formatting.Indented);
//return Ok(json);
}
// GET api/values/5
public IHttpActionResult Get(int id)
{
//var value = DataManager.Items?.Find(v => v.Id == id) ?? null;
//if (value == null)
//{
// return NotFound();
//}
return Ok();
}
// POST api/values
public IHttpActionResult Post([FromBody] JObject value)
{
//value.Id = DataManager.Items?.Count ?? 0;
//DataManager.Items.Add(value);
//DataManager.Save();
return CreatedAtRoute("DefaultApi", new { id = value }, value);
}
// PUT api/values/5
public IHttpActionResult Put(int id, [FromBody] JObject value)
{
//var index = DataManager.Items.FindIndex(v => v.Id == id);
//if (index == -1)
//{
// return NotFound();
//}
//DataManager.Items[index] = value;
//DataManager.Save();
return Ok();
}
// DELETE api/values/5
public IHttpActionResult Delete(int id)
{
//var index = DataManager.Items.FindIndex(v => v.Id == id);
//if (index == -1)
//{
// return NotFound();
//}
//DataManager.Items.RemoveAt(index);
//DataManager.Save();
return Ok();
}
}
}

View File

@@ -1795,15 +1795,15 @@ namespace Project.DSListTableAdapters {
this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [K4EE_Component_Reel_CustRule] WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pre", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pre", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pos", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pos", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_exp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_exp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pre", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pre", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pos", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pos", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_len", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_exp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_exp", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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_CustRule] ([code], [MatchEx], [MatchIndex], [GroupIndex], [ReplaceEx], [ReplaceStr], [varName], [Remark]) VALUES (@code, @MatchEx, @MatchIndex, @GroupIndex, @ReplaceEx, @ReplaceStr, @varName, @Remark);
@@ -1820,22 +1820,22 @@ SELECT idx, code, MatchEx, MatchIndex, GroupIndex, ReplaceEx, ReplaceStr, varNam
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [K4EE_Component_Reel_CustRule] SET [code] = @code, [pre] = @pre, [pos] = @pos, [len] = @len, [exp] = @exp WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)));
SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code = @code)";
SELECT code, pre, pos, len, exp FROM Component_Reel_CustRule WHERE (code = @code)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pre", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pos", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@exp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pre", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pos", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@len", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@exp", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pre", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pre", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pre", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "pre", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pos", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pos", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pos", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "pos", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_len", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_len", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "len", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_exp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_exp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_exp", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "exp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1913,7 +1913,7 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
public virtual int Delete(string Original_code, string Original_pre, string Original_pos, global::System.Nullable<int> Original_len, string Original_exp) {
public virtual int Delete(string Original_code, object Original_pre, object Original_pos, object Original_len, object Original_exp) {
if ((Original_code == null)) {
throw new global::System.ArgumentNullException("Original_code");
}
@@ -1921,36 +1921,32 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_code));
}
if ((Original_pre == null)) {
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_pre");
}
else {
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_pre));
this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(Original_pre));
}
if ((Original_pos == null)) {
this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_pos");
}
else {
this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_pos));
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(Original_pos));
}
if ((Original_len.HasValue == true)) {
this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[6].Value = ((int)(Original_len.Value));
if ((Original_len == null)) {
throw new global::System.ArgumentNullException("Original_len");
}
else {
this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value;
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(Original_len));
}
if ((Original_exp == null)) {
this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_exp");
}
else {
this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_exp));
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(Original_exp));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
@@ -2041,7 +2037,7 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(string code, string pre, string pos, global::System.Nullable<int> len, string exp, string Original_code, string Original_pre, string Original_pos, global::System.Nullable<int> Original_len, string Original_exp) {
public virtual int Update(string code, object pre, object pos, object len, object exp, string Original_code, object Original_pre, object Original_pos, object Original_len, object Original_exp) {
if ((code == null)) {
throw new global::System.ArgumentNullException("code");
}
@@ -2049,28 +2045,28 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(code));
}
if ((pre == null)) {
this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("pre");
}
else {
this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(pre));
this.Adapter.UpdateCommand.Parameters[1].Value = ((object)(pre));
}
if ((pos == null)) {
this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("pos");
}
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(pos));
this.Adapter.UpdateCommand.Parameters[2].Value = ((object)(pos));
}
if ((len.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(len.Value));
if ((len == null)) {
throw new global::System.ArgumentNullException("len");
}
else {
this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(len));
}
if ((exp == null)) {
this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("exp");
}
else {
this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(exp));
this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(exp));
}
if ((Original_code == null)) {
throw new global::System.ArgumentNullException("Original_code");
@@ -2079,36 +2075,32 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_code));
}
if ((Original_pre == null)) {
this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_pre");
}
else {
this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_pre));
this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(Original_pre));
}
if ((Original_pos == null)) {
this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_pos");
}
else {
this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_pos));
this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(Original_pos));
}
if ((Original_len.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_len.Value));
if ((Original_len == null)) {
throw new global::System.ArgumentNullException("Original_len");
}
else {
this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(Original_len));
}
if ((Original_exp == null)) {
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("Original_exp");
}
else {
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_exp));
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(Original_exp));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
@@ -2130,7 +2122,7 @@ SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(string pre, string pos, global::System.Nullable<int> len, string exp, string Original_code, string Original_pre, string Original_pos, global::System.Nullable<int> Original_len, string Original_exp) {
public virtual int Update(object pre, object pos, object len, object exp, string Original_code, object Original_pre, object Original_pos, object Original_len, object Original_exp) {
return this.Update(Original_code, pre, pos, len, exp, Original_code, Original_pre, Original_pos, Original_len, Original_exp);
}
}

View File

@@ -11,18 +11,18 @@
<MainSource>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_CustRule" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Component_Reel_CustRule] WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)))</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>DELETE FROM [K4EE_Component_Reel_CustRule] WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pre" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pre" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pos" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pos" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_exp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_exp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_code" ColumnName="code" DataSourceName="WMS.dbo.K4EE_Component_Reel_CustRule" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_code" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_pre" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_pre" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_pre" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_pre" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_pos" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_pos" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_pos" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_pos" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_len" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_len" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_len" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_exp" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_exp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_exp" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_exp" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
@@ -50,24 +50,24 @@ FROM K4EE_Component_Reel_CustRule</CommandText>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Component_Reel_CustRule] SET [code] = @code, [pre] = @pre, [pos] = @pos, [len] = @len, [exp] = @exp WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)));
SELECT code, pre, pos, len, exp FROM Component_Reel_CustRule WHERE (code = @code)</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE [K4EE_Component_Reel_CustRule] SET [code] = @code, [pre] = @pre, [pos] = @pos, [len] = @len, [exp] = @exp WHERE (([code] = @Original_code) AND ((@IsNull_pre = 1 AND [pre] IS NULL) OR ([pre] = @Original_pre)) AND ((@IsNull_pos = 1 AND [pos] IS NULL) OR ([pos] = @Original_pos)) AND ((@IsNull_len = 1 AND [len] IS NULL) OR ([len] = @Original_len)) AND ((@IsNull_exp = 1 AND [exp] IS NULL) OR ([exp] = @Original_exp)));
SELECT code, pre, pos, len, exp FROM K4EE_Component_Reel_CustRule WHERE (code = @code)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pre" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pos" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@exp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pre" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pre" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pos" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pos" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_exp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_exp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="code" ColumnName="code" DataSourceName="WMS.dbo.K4EE_Component_Reel_CustRule" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="pre" ColumnName="pre" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@pre" Precision="0" Scale="0" Size="1024" SourceColumn="pre" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="pos" ColumnName="pos" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@pos" Precision="0" Scale="0" Size="1024" SourceColumn="pos" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="len" ColumnName="len" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@len" Precision="0" Scale="0" Size="1024" SourceColumn="len" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="exp" ColumnName="exp" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@exp" Precision="0" Scale="0" Size="1024" SourceColumn="exp" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_code" ColumnName="code" DataSourceName="WMS.dbo.K4EE_Component_Reel_CustRule" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_code" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_pre" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_pre" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pre" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_pre" ColumnName="pre" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_pre" Precision="0" Scale="0" Size="1024" SourceColumn="pre" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_pos" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_pos" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pos" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_pos" ColumnName="pos" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_pos" Precision="0" Scale="0" Size="1024" SourceColumn="pos" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_len" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_len" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="len" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_len" ColumnName="len" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_len" Precision="0" Scale="0" Size="1024" SourceColumn="len" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_exp" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_exp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="exp" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_exp" ColumnName="exp" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@Original_exp" Precision="0" Scale="0" Size="1024" SourceColumn="exp" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>

File diff suppressed because it is too large Load Diff

View File

@@ -4,34 +4,33 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-139" ViewPortY="234" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-129" ViewPortY="30" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:K4EE_Component_Reel_Result" ZOrder="21" X="-129" Y="198" Height="533" Width="313" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:K4EE_Component_Reel_RegExRule" ZOrder="1" X="-3" Y="234" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Convert" ZOrder="9" X="-67" Y="154" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Information" ZOrder="17" X="5" Y="229" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="197" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_PreSet" ZOrder="8" X="68" Y="68" Height="305" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_CustInfo" ZOrder="22" X="123" Y="97" Height="115" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ResultSummary" ZOrder="14" X="-124" Y="28" Height="153" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:K4EE_Component_Reel_Print_Information" ZOrder="7" X="108" Y="81" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:K4EE_Component_Reel_PrintRegExRule" ZOrder="2" X="48" Y="39" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:CustCodeList" ZOrder="15" X="587" Y="115" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:SidinfoCustGroup" ZOrder="4" X="368" Y="547" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:Users" ZOrder="18" X="645" Y="602" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:MCModel" ZOrder="13" X="653" Y="596" Height="410" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
<Shape ID="DesignTable:language" ZOrder="24" X="685" Y="603" Height="239" Width="134" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:OPModel" ZOrder="5" X="815" Y="308" Height="371" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="367" />
<Shape ID="DesignTable:BCDData" ZOrder="12" X="657" Y="586" Height="163" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:UserSID" ZOrder="26" X="671" Y="606" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:MailFormat" ZOrder="19" X="673" Y="596" Height="49" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
<Shape ID="DesignTable:MailRecipient" ZOrder="25" X="664" Y="596" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:SIDHistory" ZOrder="10" X="666" Y="598" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:InputDescription" ZOrder="11" X="662" Y="595" Height="143" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:OutputDescription" ZOrder="20" X="658" Y="594" Height="182" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:UserTable" ZOrder="6" X="662" Y="597" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:ErrorDescription" ZOrder="16" X="654" Y="604" Height="105" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:ModelList" ZOrder="23" X="683" Y="598" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="3" X="532" Y="260" Height="315" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
<Shape ID="DesignTable:K4EE_Component_Reel_Result" ZOrder="22" X="256" Y="216" Height="533" Width="313" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:K4EE_Component_Reel_RegExRule" ZOrder="11" X="989" Y="120" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Convert" ZOrder="17" X="523" Y="187" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Information" ZOrder="20" X="510" Y="176" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="197" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_PreSet" ZOrder="16" X="622" Y="154" Height="305" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_CustInfo" ZOrder="1" X="658" Y="45" Height="115" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ResultSummary" ZOrder="18" X="-124" Y="28" Height="153" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:K4EE_Component_Reel_Print_Information" ZOrder="15" X="560" Y="83" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:CustCodeList" ZOrder="19" X="932" Y="62" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:SidinfoCustGroup" ZOrder="14" X="747" Y="496" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:Users" ZOrder="4" X="791" Y="379" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:MCModel" ZOrder="6" X="919" Y="476" Height="410" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
<Shape ID="DesignTable:language" ZOrder="24" X="912" Y="519" Height="239" Width="134" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:OPModel" ZOrder="12" X="1026" Y="230" Height="486" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="482" />
<Shape ID="DesignTable:BCDData" ZOrder="7" X="877" Y="455" Height="163" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:UserSID" ZOrder="25" X="872" Y="524" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:MailFormat" ZOrder="21" X="806" Y="428" Height="49" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
<Shape ID="DesignTable:MailRecipient" ZOrder="2" X="860" Y="495" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:SIDHistory" ZOrder="9" X="841" Y="350" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:InputDescription" ZOrder="8" X="744" Y="350" Height="143" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:OutputDescription" ZOrder="3" X="864" Y="466" Height="182" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:UserTable" ZOrder="10" X="734" Y="246" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:ErrorDescription" ZOrder="5" X="831" Y="439" Height="105" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:ModelList" ZOrder="23" X="901" Y="509" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="13" X="745" Y="74" Height="315" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
</Shapes>
<Connectors />
</DiagramLayout>

File diff suppressed because it is too large Load Diff

View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
using AR;
using System.Security.Cryptography;
namespace Project.Device
{
@@ -323,7 +324,30 @@ namespace Project.Device
}
}
public bool BSave(int no)
{
var cmd = "BSAVE,{no}";
try
{
ws.Send(cmd + "\r");
return true;
}
catch {
return false;
}
}
public bool BLoad(int no)
{
var cmd = "BLOAD,{no}";
try
{
ws.Send(cmd + "\r");
return true;
}
catch {
return false;
}
}
public void Trigger(bool bOn)
{
//if (IsTriggerOn) return;

View File

@@ -1,4 +1,5 @@
using System;
using AR;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -10,7 +11,7 @@ namespace Project.Device
{
public string LastPrintZPL = string.Empty;
public string qrData = string.Empty;
public string ZPLFileName { get; set; } = "zpl.txt";
public string ZPLFileName { get; set; } = UTIL.MakePath("data","zpl.txt");
public string baseZPL
{
get
@@ -19,7 +20,7 @@ namespace Project.Device
if (fi.Exists == false || fi.Length == 0)
{
PUB.log.AddE($"{ZPLFileName} does not exist or has no data. Changed to default zpl.txt");
fi = new System.IO.FileInfo("zpl.txt");
fi = new System.IO.FileInfo( UTIL.MakePath("data", "zpl.txt"));
if (fi.Exists == false) PUB.log.AddE("Print template file (zpl.txt) does not exist");
}
if (fi.Exists && fi.Length > 1)

View File

@@ -19,7 +19,7 @@ namespace Project.Device
public string PortName { get; set; }
public int BaudRate { get; set; }
public string ZPLFileName { get; set; } = "zpl.txt";
public string ZPLFileName { get; set; } = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data", "zpl.txt");
public string baseZPL
{
get
@@ -28,7 +28,7 @@ namespace Project.Device
if (fi.Exists == false || fi.Length == 0)
{
PUB.log.AddE($"{ZPLFileName} does not exist or has no data. Changed to default zpl.txt");
fi = new System.IO.FileInfo("zpl.txt");
fi = new System.IO.FileInfo(UTIL.MakePath("Data", "zpl.txt"));
if (fi.Exists == false) PUB.log.AddE("Print template file (zpl.txt) does not exist");
}
if (fi.Exists && fi.Length > 1)
@@ -38,7 +38,7 @@ namespace Project.Device
PUB.log.AddAT("No ZPL file found, using ZPL code from settings");
return Properties.Settings.Default.ZPL7;
}
}
}

View File

@@ -390,9 +390,7 @@ namespace Project
private void tmDisplay_Tick(object sender, EventArgs e)
{
tabControl4.TabPages[0].Text = $"({axisIndex}) JOG";
if (PUB.joypad != null && PUB.joypad.IsOpen)
this.Text = "MODEL(MOTION) SETTING - JOYSTICK GROUP:" + PUB.Result.JoystickAxisGroup.ToString();
else
this.Text = "MODEL(MOTION) SETTING";
if (PUB.mot.IsInit == false)

View File

@@ -136,12 +136,6 @@ namespace Project.Dialog
private void tmDisplay_Tick(object sender, EventArgs e)
{
//this.lbMotPos.Text = $"X:{Pub.mot.GetActPos((int)eAxis.X1_TOP}";
//tabControl4.TabPages[0].Text = $"({axisIndex}) JOG";
if (PUB.joypad != null && PUB.joypad.IsOpen)
this.Text = "MODEL(MOTION) SETTING - JOYSTICK GROUP:" + PUB.Result.JoystickAxisGroup.ToString();
else
this.Text = "MODEL(MOTION) SETTING";
if (PUB.mot.IsInit == false)

View File

@@ -29,14 +29,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation));
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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation));
this.dv = new arCtl.arDatagridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BSave = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ds1 = new Project.DataSet1();
this.tmDisplay = new System.Windows.Forms.Timer(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.checkBox31 = new System.Windows.Forms.CheckBox();
@@ -135,10 +140,9 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.arLabel2 = new arCtl.arLabel();
this.arLabel18 = new arCtl.arLabel();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ds1 = new Project.DataSet1();
((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.panel5.SuspendLayout();
this.panel4.SuspendLayout();
this.panel1.SuspendLayout();
@@ -154,8 +158,6 @@
this.tableLayoutPanel1.SuspendLayout();
this.panel3.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.SuspendLayout();
//
// dv
@@ -175,24 +177,25 @@
this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column1,
this.dvc_title,
this.Code});
this.Code,
this.BSave});
this.dv.DataSource = this.bs;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(5);
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dv.DefaultCellStyle = dataGridViewCellStyle4;
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;
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(502, 425);
this.dv.Size = new System.Drawing.Size(639, 425);
this.dv.TabIndex = 1;
this.dv.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv_DataError);
//
@@ -206,6 +209,15 @@
this.Column1.Name = "Column1";
this.Column1.Width = 50;
//
// dvc_title
//
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;
this.dvc_title.HeaderText = "Description";
this.dvc_title.Name = "dvc_title";
//
// Code
//
this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -215,6 +227,26 @@
this.Code.HeaderText = "Customer Code";
this.Code.Name = "Code";
//
// BSave
//
this.BSave.DataPropertyName = "BSave";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.BSave.DefaultCellStyle = dataGridViewCellStyle4;
this.BSave.HeaderText = "Mem";
this.BSave.Name = "BSave";
this.BSave.Width = 79;
//
// bs
//
this.bs.DataMember = "OPModel";
this.bs.DataSource = this.ds1;
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged_1);
//
// ds1
//
this.ds1.DataSetName = "DataSet1";
this.ds1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// tmDisplay
//
this.tmDisplay.Interval = 500;
@@ -227,7 +259,7 @@
this.checkBox31.Dock = System.Windows.Forms.DockStyle.Left;
this.checkBox31.Location = new System.Drawing.Point(409, 0);
this.checkBox31.Name = "checkBox31";
this.checkBox31.Size = new System.Drawing.Size(148, 34);
this.checkBox31.Size = new System.Drawing.Size(223, 34);
this.checkBox31.TabIndex = 8;
this.checkBox31.Text = "Exclude Undefined Barcodes";
this.toolTip1.SetToolTip(this.checkBox31, "Excludes data not in barcode rules..");
@@ -238,9 +270,10 @@
this.chkOwnZPL.AutoSize = true;
this.chkOwnZPL.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "bOwnZPL", true));
this.chkOwnZPL.Dock = System.Windows.Forms.DockStyle.Right;
this.chkOwnZPL.Location = new System.Drawing.Point(519, 0);
this.chkOwnZPL.Font = new System.Drawing.Font("맑은 고딕", 10.5F);
this.chkOwnZPL.Location = new System.Drawing.Point(494, 0);
this.chkOwnZPL.Name = "chkOwnZPL";
this.chkOwnZPL.Size = new System.Drawing.Size(133, 34);
this.chkOwnZPL.Size = new System.Drawing.Size(158, 34);
this.chkOwnZPL.TabIndex = 17;
this.chkOwnZPL.Text = "Individual Print Code";
this.toolTip1.SetToolTip(this.chkOwnZPL, "Excludes data not in barcode rules..");
@@ -253,7 +286,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(1231, 689);
this.panel5.Size = new System.Drawing.Size(1368, 689);
this.panel5.TabIndex = 3;
//
// panel4
@@ -267,7 +300,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(1231, 636);
this.panel4.Size = new System.Drawing.Size(1368, 636);
this.panel4.TabIndex = 3;
//
// panel1
@@ -278,7 +311,7 @@
this.panel1.Controls.Add(this.panel6);
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(502, 136);
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, 425);
@@ -305,11 +338,11 @@
this.chkSIDCHK.AutoSize = true;
this.chkSIDCHK.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "CheckSIDExsit", true));
this.chkSIDCHK.Dock = System.Windows.Forms.DockStyle.Left;
this.chkSIDCHK.Font = new System.Drawing.Font("맑은 고딕", 12F);
this.chkSIDCHK.Font = new System.Drawing.Font("맑은 고딕", 10.5F);
this.chkSIDCHK.ForeColor = System.Drawing.Color.Red;
this.chkSIDCHK.Location = new System.Drawing.Point(300, 0);
this.chkSIDCHK.Location = new System.Drawing.Point(292, 0);
this.chkSIDCHK.Name = "chkSIDCHK";
this.chkSIDCHK.Size = new System.Drawing.Size(117, 34);
this.chkSIDCHK.Size = new System.Drawing.Size(155, 34);
this.chkSIDCHK.TabIndex = 16;
this.chkSIDCHK.Tag = "0";
this.chkSIDCHK.Text = "SID Existence Check";
@@ -320,11 +353,11 @@
this.checkBox32.AutoSize = true;
this.checkBox32.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "DisablePrinter", true));
this.checkBox32.Dock = System.Windows.Forms.DockStyle.Left;
this.checkBox32.Font = new System.Drawing.Font("맑은 고딕", 12F);
this.checkBox32.Font = new System.Drawing.Font("맑은 고딕", 10.5F);
this.checkBox32.ForeColor = System.Drawing.Color.Red;
this.checkBox32.Location = new System.Drawing.Point(147, 0);
this.checkBox32.Location = new System.Drawing.Point(148, 0);
this.checkBox32.Name = "checkBox32";
this.checkBox32.Size = new System.Drawing.Size(153, 34);
this.checkBox32.Size = new System.Drawing.Size(144, 34);
this.checkBox32.TabIndex = 15;
this.checkBox32.Tag = "0";
this.checkBox32.Text = "Do not use printer";
@@ -336,11 +369,11 @@
this.chkEnbCamera.AutoSize = true;
this.chkEnbCamera.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "DisableCamera", true));
this.chkEnbCamera.Dock = System.Windows.Forms.DockStyle.Left;
this.chkEnbCamera.Font = new System.Drawing.Font("맑은 고딕", 12F);
this.chkEnbCamera.Font = new System.Drawing.Font("맑은 고딕", 10.5F);
this.chkEnbCamera.ForeColor = System.Drawing.Color.Red;
this.chkEnbCamera.Location = new System.Drawing.Point(10, 0);
this.chkEnbCamera.Name = "chkEnbCamera";
this.chkEnbCamera.Size = new System.Drawing.Size(137, 34);
this.chkEnbCamera.Size = new System.Drawing.Size(138, 34);
this.chkEnbCamera.TabIndex = 14;
this.chkEnbCamera.Tag = "0";
this.chkEnbCamera.Text = "Do not use vision";
@@ -393,7 +426,7 @@
this.chkApplySidInfo.ForeColor = System.Drawing.Color.Gray;
this.chkApplySidInfo.Location = new System.Drawing.Point(13, 202);
this.chkApplySidInfo.Name = "chkApplySidInfo";
this.chkApplySidInfo.Size = new System.Drawing.Size(419, 25);
this.chkApplySidInfo.Size = new System.Drawing.Size(431, 25);
this.chkApplySidInfo.TabIndex = 33;
this.chkApplySidInfo.Tag = "6";
this.chkApplySidInfo.Text = "Automatically record data using SID information table";
@@ -407,10 +440,10 @@
this.chkApplyJobInfo.ForeColor = System.Drawing.Color.Gray;
this.chkApplyJobInfo.Location = new System.Drawing.Point(13, 170);
this.chkApplyJobInfo.Name = "chkApplyJobInfo";
this.chkApplyJobInfo.Size = new System.Drawing.Size(423, 25);
this.chkApplyJobInfo.Size = new System.Drawing.Size(424, 25);
this.chkApplyJobInfo.TabIndex = 32;
this.chkApplyJobInfo.Tag = "5";
this.chkApplyJobInfo.Text = "Automatically record data using today's work history";
this.chkApplyJobInfo.Text = "Automatically record data using today\'s work history";
this.chkApplyJobInfo.UseVisualStyleBackColor = true;
this.chkApplyJobInfo.CheckStateChanged += new System.EventHandler(this.chkApplySidInfo_CheckStateChanged);
//
@@ -421,7 +454,7 @@
this.chkApplySIDConvData.ForeColor = System.Drawing.Color.Gray;
this.chkApplySIDConvData.Location = new System.Drawing.Point(13, 234);
this.chkApplySIDConvData.Name = "chkApplySIDConvData";
this.chkApplySIDConvData.Size = new System.Drawing.Size(425, 25);
this.chkApplySIDConvData.Size = new System.Drawing.Size(426, 25);
this.chkApplySIDConvData.TabIndex = 31;
this.chkApplySIDConvData.Tag = "7";
this.chkApplySIDConvData.Text = "Automatically record data using SID conversion table";
@@ -435,7 +468,7 @@
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(435, 25);
this.chkUserConfirm.Size = new System.Drawing.Size(444, 25);
this.chkUserConfirm.TabIndex = 13;
this.chkUserConfirm.Tag = "0";
this.chkUserConfirm.Text = "User confirms final print values (no automatic progress)";
@@ -449,7 +482,7 @@
this.chkSIDConv.ForeColor = System.Drawing.Color.Gray;
this.chkSIDConv.Location = new System.Drawing.Point(13, 138);
this.chkSIDConv.Name = "chkSIDConv";
this.chkSIDConv.Size = new System.Drawing.Size(409, 25);
this.chkSIDConv.Size = new System.Drawing.Size(372, 25);
this.chkSIDConv.TabIndex = 28;
this.chkSIDConv.Tag = "4";
this.chkSIDConv.Text = "Convert SID values using SID conversion table";
@@ -463,7 +496,7 @@
this.chkQtyServer.ForeColor = System.Drawing.Color.Gray;
this.chkQtyServer.Location = new System.Drawing.Point(13, 43);
this.chkQtyServer.Name = "chkQtyServer";
this.chkQtyServer.Size = new System.Drawing.Size(444, 25);
this.chkQtyServer.Size = new System.Drawing.Size(388, 25);
this.chkQtyServer.TabIndex = 13;
this.chkQtyServer.Tag = "1";
this.chkQtyServer.Text = "Query and use server quantity based on Reel ID";
@@ -477,7 +510,7 @@
this.chkQtyMRQ.ForeColor = System.Drawing.Color.Gray;
this.chkQtyMRQ.Location = new System.Drawing.Point(13, 106);
this.chkQtyMRQ.Name = "chkQtyMRQ";
this.chkQtyMRQ.Size = new System.Drawing.Size(405, 25);
this.chkQtyMRQ.Size = new System.Drawing.Size(453, 25);
this.chkQtyMRQ.TabIndex = 27;
this.chkQtyMRQ.Tag = "3";
this.chkQtyMRQ.Text = "Enter quantity directly (automatic progress if RQ is read)";
@@ -491,7 +524,7 @@
this.chkNew.ForeColor = System.Drawing.Color.Gray;
this.chkNew.Location = new System.Drawing.Point(13, 75);
this.chkNew.Name = "chkNew";
this.chkNew.Size = new System.Drawing.Size(247, 24);
this.chkNew.Size = new System.Drawing.Size(159, 24);
this.chkNew.TabIndex = 24;
this.chkNew.Tag = "2";
this.chkNew.Text = "Create new Reel ID";
@@ -543,7 +576,7 @@
this.chkSave2.ForeColor = System.Drawing.Color.Tomato;
this.chkSave2.Location = new System.Drawing.Point(431, 51);
this.chkSave2.Name = "chkSave2";
this.chkSave2.Size = new System.Drawing.Size(230, 23);
this.chkSave2.Size = new System.Drawing.Size(282, 23);
this.chkSave2.TabIndex = 39;
this.chkSave2.Tag = "11";
this.chkSave2.Text = "Record change information to server";
@@ -603,7 +636,7 @@
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(84, 15);
this.label6.TabIndex = 29;
this.label6.Text = "Query Target";
//
@@ -614,7 +647,7 @@
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(83, 15);
this.label7.TabIndex = 29;
this.label7.Text = "Apply Target";
//
@@ -751,7 +784,7 @@
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(84, 15);
this.label3.TabIndex = 29;
this.label3.Text = "Query Target";
//
@@ -762,7 +795,7 @@
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(83, 15);
this.label2.TabIndex = 29;
this.label2.Text = "Apply Target";
//
@@ -928,7 +961,7 @@
this.chkSave1.ForeColor = System.Drawing.Color.Tomato;
this.chkSave1.Location = new System.Drawing.Point(431, 50);
this.chkSave1.Name = "chkSave1";
this.chkSave1.Size = new System.Drawing.Size(230, 23);
this.chkSave1.Size = new System.Drawing.Size(282, 23);
this.chkSave1.TabIndex = 33;
this.chkSave1.Tag = "8";
this.chkSave1.Text = "Record change information to server";
@@ -952,7 +985,7 @@
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(84, 15);
this.label4.TabIndex = 29;
this.label4.Text = "Query Target";
//
@@ -963,7 +996,7 @@
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(83, 15);
this.label5.TabIndex = 29;
this.label5.Text = "Apply Target";
//
@@ -1194,7 +1227,7 @@
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1231, 100);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1368, 100);
this.tableLayoutPanel1.TabIndex = 31;
//
// btConvOk
@@ -1203,7 +1236,7 @@
this.btConvOk.Font = new System.Drawing.Font("맑은 고딕", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btConvOk.Location = new System.Drawing.Point(3, 3);
this.btConvOk.Name = "btConvOk";
this.btConvOk.Size = new System.Drawing.Size(609, 94);
this.btConvOk.Size = new System.Drawing.Size(678, 94);
this.btConvOk.TabIndex = 0;
this.btConvOk.Text = "Conveyor ON";
this.btConvOk.UseVisualStyleBackColor = true;
@@ -1213,9 +1246,9 @@
//
this.btConvOff.Dock = System.Windows.Forms.DockStyle.Fill;
this.btConvOff.Font = new System.Drawing.Font("맑은 고딕", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btConvOff.Location = new System.Drawing.Point(618, 3);
this.btConvOff.Location = new System.Drawing.Point(687, 3);
this.btConvOff.Name = "btConvOff";
this.btConvOff.Size = new System.Drawing.Size(610, 94);
this.btConvOff.Size = new System.Drawing.Size(678, 94);
this.btConvOff.TabIndex = 0;
this.btConvOff.Text = "Conveyor OFF";
this.btConvOff.UseVisualStyleBackColor = true;
@@ -1235,7 +1268,7 @@
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, 561);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1231, 20);
this.panel3.Size = new System.Drawing.Size(1368, 20);
this.panel3.TabIndex = 29;
//
// label15
@@ -1344,7 +1377,7 @@
this.toolStripSeparator1});
this.toolStrip1.Location = new System.Drawing.Point(0, 581);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1231, 55);
this.toolStrip1.Size = new System.Drawing.Size(1368, 55);
this.toolStrip1.TabIndex = 8;
this.toolStrip1.Text = "toolStrip1";
//
@@ -1353,7 +1386,7 @@
this.btAdd.Image = global::Project.Properties.Resources.icons8_add_40;
this.btAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btAdd.Name = "btAdd";
this.btAdd.Size = new System.Drawing.Size(99, 52);
this.btAdd.Size = new System.Drawing.Size(97, 52);
this.btAdd.Text = "Add(&A)";
this.btAdd.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -1362,7 +1395,7 @@
this.btDel.Image = global::Project.Properties.Resources.icons8_delete_40;
this.btDel.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btDel.Name = "btDel";
this.btDel.Size = new System.Drawing.Size(100, 52);
this.btDel.Size = new System.Drawing.Size(110, 52);
this.btDel.Text = "Delete(&D)";
this.btDel.Click += new System.EventHandler(this.toolStripButton5_Click);
//
@@ -1370,7 +1403,7 @@
//
this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(98, 52);
this.btSave.Size = new System.Drawing.Size(99, 52);
this.btSave.Text = "Save(&S)";
this.btSave.Click += new System.EventHandler(this.toolStripButton9_Click);
//
@@ -1379,7 +1412,7 @@
this.btCopy.Image = ((System.Drawing.Image)(resources.GetObject("btCopy.Image")));
this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btCopy.Name = "btCopy";
this.btCopy.Size = new System.Drawing.Size(83, 52);
this.btCopy.Size = new System.Drawing.Size(87, 52);
this.btCopy.Text = "Copy";
this.btCopy.Click += new System.EventHandler(this.toolStripButton8_Click);
//
@@ -1439,7 +1472,7 @@
this.arLabel2.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel2.SignColor = System.Drawing.Color.Yellow;
this.arLabel2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel2.Size = new System.Drawing.Size(1231, 36);
this.arLabel2.Size = new System.Drawing.Size(1368, 36);
this.arLabel2.TabIndex = 7;
this.arLabel2.Text = "Description";
this.arLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1484,38 +1517,18 @@
this.arLabel18.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel18.SignColor = System.Drawing.Color.Yellow;
this.arLabel18.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel18.Size = new System.Drawing.Size(1231, 53);
this.arLabel18.Size = new System.Drawing.Size(1368, 53);
this.arLabel18.TabIndex = 5;
this.arLabel18.Text = "--";
this.arLabel18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel18.TextShadow = true;
this.arLabel18.TextVisible = true;
//
// dvc_title
//
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;
this.dvc_title.HeaderText = "Description";
this.dvc_title.Name = "dvc_title";
//
// bs
//
this.bs.DataMember = "OPModel";
this.bs.DataSource = this.ds1;
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged_1);
//
// ds1
//
this.ds1.DataSetName = "DataSet1";
this.ds1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// Model_Operation
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(1233, 691);
this.ClientSize = new System.Drawing.Size(1370, 691);
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")));
@@ -1525,6 +1538,8 @@
this.Text = "Model Selection";
this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.panel5.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.panel4.PerformLayout();
@@ -1549,8 +1564,6 @@
this.panel3.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.ResumeLayout(false);
}
@@ -1648,9 +1661,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Button btConvOk;
private System.Windows.Forms.Button btConvOff;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_title;
private System.Windows.Forms.DataGridViewTextBoxColumn Code;
private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.CheckBox chkEnbCamera;
private System.Windows.Forms.CheckBox checkBox32;
@@ -1661,5 +1671,9 @@
private System.Windows.Forms.CheckBox chkSave2;
private System.Windows.Forms.CheckBox chkOwnZPL;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_title;
private System.Windows.Forms.DataGridViewTextBoxColumn Code;
private System.Windows.Forms.DataGridViewTextBoxColumn BSave;
}
}

View File

@@ -558,7 +558,7 @@ namespace Project
var idx = dr.idx;
var fn = UTIL.MakePath("Model", idx.ToString(), "zpl.txt");
var fnBase = UTIL.MakePath("zpl.txt");
var fnBase = UTIL.MakePath("Data","zpl.txt");
if (System.IO.File.Exists(fnBase) && System.IO.File.Exists(fn) == false)
{
UTIL.MsgI("Dedicated output file (ZPL.TXT) does not exist, copying from default");

View File

@@ -123,6 +123,9 @@
<metadata name="Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="BSave.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>292, 17</value>
</metadata>

View File

@@ -55,6 +55,8 @@
this.button16 = new System.Windows.Forms.Button();
this.button17 = new System.Windows.Forms.Button();
this.button19 = new System.Windows.Forms.Button();
this.btLCyl = new System.Windows.Forms.Button();
this.btRCyl = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -70,8 +72,6 @@
this.button9 = new System.Windows.Forms.Button();
this.button11 = new System.Windows.Forms.Button();
this.button18 = new System.Windows.Forms.Button();
this.btLCyl = new System.Windows.Forms.Button();
this.btRCyl = new System.Windows.Forms.Button();
this.panBG.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
@@ -480,27 +480,55 @@
// button17
//
this.button17.Dock = System.Windows.Forms.DockStyle.Fill;
this.button17.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button17.ForeColor = System.Drawing.Color.Black;
this.button17.Location = new System.Drawing.Point(3, 248);
this.button17.Name = "button17";
this.button17.Size = new System.Drawing.Size(63, 47);
this.button17.TabIndex = 62;
this.button17.Text = "L Conveyor";
this.button17.Text = "L\r\nConv";
this.button17.UseVisualStyleBackColor = true;
this.button17.Click += new System.EventHandler(this.button17_Click);
//
// button19
//
this.button19.Dock = System.Windows.Forms.DockStyle.Fill;
this.button19.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button19.ForeColor = System.Drawing.Color.Black;
this.button19.Location = new System.Drawing.Point(210, 248);
this.button19.Name = "button19";
this.button19.Size = new System.Drawing.Size(63, 47);
this.button19.TabIndex = 62;
this.button19.Text = "R Conveyor";
this.button19.Text = "R\r\nConv";
this.button19.UseVisualStyleBackColor = true;
this.button19.Click += new System.EventHandler(this.button19_Click);
//
// btLCyl
//
this.btLCyl.Dock = System.Windows.Forms.DockStyle.Fill;
this.btLCyl.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btLCyl.ForeColor = System.Drawing.Color.Black;
this.btLCyl.Location = new System.Drawing.Point(72, 248);
this.btLCyl.Name = "btLCyl";
this.btLCyl.Size = new System.Drawing.Size(63, 47);
this.btLCyl.TabIndex = 63;
this.btLCyl.Text = "L\r\nCylinder";
this.btLCyl.UseVisualStyleBackColor = true;
this.btLCyl.Click += new System.EventHandler(this.button20_Click);
//
// btRCyl
//
this.btRCyl.Dock = System.Windows.Forms.DockStyle.Fill;
this.btRCyl.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btRCyl.ForeColor = System.Drawing.Color.Black;
this.btRCyl.Location = new System.Drawing.Point(141, 248);
this.btRCyl.Name = "btRCyl";
this.btRCyl.Size = new System.Drawing.Size(63, 47);
this.btRCyl.TabIndex = 63;
this.btRCyl.Text = "R\r\nCylinder";
this.btRCyl.UseVisualStyleBackColor = true;
this.btRCyl.Click += new System.EventHandler(this.button21_Click);
//
// panel2
//
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
@@ -771,30 +799,6 @@
this.button18.UseVisualStyleBackColor = false;
this.button18.Click += new System.EventHandler(this.button9_Click);
//
// btLCyl
//
this.btLCyl.Dock = System.Windows.Forms.DockStyle.Fill;
this.btLCyl.ForeColor = System.Drawing.Color.Black;
this.btLCyl.Location = new System.Drawing.Point(72, 248);
this.btLCyl.Name = "btLCyl";
this.btLCyl.Size = new System.Drawing.Size(63, 47);
this.btLCyl.TabIndex = 63;
this.btLCyl.Text = "L Cylinder";
this.btLCyl.UseVisualStyleBackColor = true;
this.btLCyl.Click += new System.EventHandler(this.button20_Click);
//
// btRCyl
//
this.btRCyl.Dock = System.Windows.Forms.DockStyle.Fill;
this.btRCyl.ForeColor = System.Drawing.Color.Black;
this.btRCyl.Location = new System.Drawing.Point(141, 248);
this.btRCyl.Name = "btRCyl";
this.btRCyl.Size = new System.Drawing.Size(63, 47);
this.btRCyl.TabIndex = 63;
this.btRCyl.Text = "R Cylinder";
this.btRCyl.UseVisualStyleBackColor = true;
this.btRCyl.Click += new System.EventHandler(this.button21_Click);
//
// Quick_Control
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F);

View File

@@ -1,451 +0,0 @@
namespace Project.Dialog
{
partial class RegExPrintRule
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RegExPrintRule));
this.dataSet1 = new Project.DataSet1();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.tam = new Project.DataSet1TableAdapters.TableAdapterManager();
this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.component_Reel_RegExRuleBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.component_Reel_RegExRuleDataGridView = new System.Windows.Forms.DataGridView();
this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.seqDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.custCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.symbolDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.patternDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.groupsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.isEnableDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.isTrustDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.isAmkStdDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.isIgnoreDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.component_Reel_RegExRuleDataGridView)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// dataSet1
//
this.dataSet1.DataSetName = "DataSet1";
this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bs
//
this.bs.DataMember = "K4EE_Component_Reel_PrintRegExRule";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "CustCode,Seq";
//
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.K4EE_Component_Reel_CustInfoTableAdapter = null;
this.tam.K4EE_Component_Reel_PreSetTableAdapter = null;
this.tam.K4EE_Component_Reel_Print_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_PrintRegExRuleTableAdapter = this.ta;
this.tam.K4EE_Component_Reel_RegExRuleTableAdapter = null;
this.tam.K4EE_Component_Reel_ResultTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_ConvertTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_InformationTableAdapter = null;
this.tam.UpdateOrder = Project.DataSet1TableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// bn
//
this.bn.AddNewItem = this.bindingNavigatorAddNewItem;
this.bn.BindingSource = this.bs;
this.bn.CountItem = this.bindingNavigatorCountItem;
this.bn.DeleteItem = this.bindingNavigatorDeleteItem;
this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bindingNavigatorMoveFirstItem,
this.bindingNavigatorMovePreviousItem,
this.bindingNavigatorSeparator,
this.bindingNavigatorPositionItem,
this.bindingNavigatorCountItem,
this.bindingNavigatorSeparator1,
this.bindingNavigatorMoveNextItem,
this.bindingNavigatorMoveLastItem,
this.bindingNavigatorSeparator2,
this.bindingNavigatorAddNewItem,
this.bindingNavigatorDeleteItem,
this.component_Reel_RegExRuleBindingNavigatorSaveItem,
this.toolStripButton1});
this.bn.Location = new System.Drawing.Point(0, 536);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(784, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
// bindingNavigatorAddNewItem
//
this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorAddNewItem.Text = "Add New";
//
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "Total item count";
//
// bindingNavigatorDeleteItem
//
this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorDeleteItem.Text = "Delete";
//
// bindingNavigatorMoveFirstItem
//
this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveFirstItem.Text = "Move to first";
//
// bindingNavigatorMovePreviousItem
//
this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMovePreviousItem.Text = "Move to previous";
//
// bindingNavigatorSeparator
//
this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
//
// bindingNavigatorPositionItem
//
this.bindingNavigatorPositionItem.AccessibleName = "Position";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
this.bindingNavigatorPositionItem.ToolTipText = "Current position";
//
// bindingNavigatorSeparator1
//
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
//
// bindingNavigatorMoveNextItem
//
this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveNextItem.Text = "Move to next";
//
// bindingNavigatorMoveLastItem
//
this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveLastItem.Text = "Move to last";
//
// bindingNavigatorSeparator2
//
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
//
// component_Reel_RegExRuleBindingNavigatorSaveItem
//
this.component_Reel_RegExRuleBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("component_Reel_RegExRuleBindingNavigatorSaveItem.Image")));
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Name = "component_Reel_RegExRuleBindingNavigatorSaveItem";
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Size = new System.Drawing.Size(23, 22);
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Text = "Save Data";
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Click += new System.EventHandler(this.component_Reel_RegExRuleBindingNavigatorSaveItem_Click);
//
// toolStripButton1
//
this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(66, 22);
this.toolStripButton1.Text = "Refresh";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// component_Reel_RegExRuleDataGridView
//
this.component_Reel_RegExRuleDataGridView.AutoGenerateColumns = false;
this.component_Reel_RegExRuleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.component_Reel_RegExRuleDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idDataGridViewTextBoxColumn,
this.seqDataGridViewTextBoxColumn,
this.custCodeDataGridViewTextBoxColumn,
this.descriptionDataGridViewTextBoxColumn,
this.symbolDataGridViewTextBoxColumn,
this.patternDataGridViewTextBoxColumn,
this.groupsDataGridViewTextBoxColumn,
this.isEnableDataGridViewCheckBoxColumn,
this.isTrustDataGridViewCheckBoxColumn,
this.isAmkStdDataGridViewCheckBoxColumn,
this.isIgnoreDataGridViewCheckBoxColumn});
this.component_Reel_RegExRuleDataGridView.DataSource = this.bs;
this.component_Reel_RegExRuleDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.component_Reel_RegExRuleDataGridView.Location = new System.Drawing.Point(0, 0);
this.component_Reel_RegExRuleDataGridView.Name = "component_Reel_RegExRuleDataGridView";
this.component_Reel_RegExRuleDataGridView.RowTemplate.Height = 23;
this.component_Reel_RegExRuleDataGridView.Size = new System.Drawing.Size(784, 486);
this.component_Reel_RegExRuleDataGridView.TabIndex = 2;
//
// idDataGridViewTextBoxColumn
//
this.idDataGridViewTextBoxColumn.DataPropertyName = "Id";
this.idDataGridViewTextBoxColumn.HeaderText = "Id";
this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
this.idDataGridViewTextBoxColumn.ReadOnly = true;
//
// seqDataGridViewTextBoxColumn
//
this.seqDataGridViewTextBoxColumn.DataPropertyName = "Seq";
this.seqDataGridViewTextBoxColumn.HeaderText = "Seq";
this.seqDataGridViewTextBoxColumn.Name = "seqDataGridViewTextBoxColumn";
//
// custCodeDataGridViewTextBoxColumn
//
this.custCodeDataGridViewTextBoxColumn.DataPropertyName = "CustCode";
this.custCodeDataGridViewTextBoxColumn.HeaderText = "CustCode";
this.custCodeDataGridViewTextBoxColumn.Name = "custCodeDataGridViewTextBoxColumn";
//
// descriptionDataGridViewTextBoxColumn
//
this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "Description";
this.descriptionDataGridViewTextBoxColumn.HeaderText = "Description";
this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn";
//
// symbolDataGridViewTextBoxColumn
//
this.symbolDataGridViewTextBoxColumn.DataPropertyName = "Symbol";
this.symbolDataGridViewTextBoxColumn.HeaderText = "Symbol";
this.symbolDataGridViewTextBoxColumn.Name = "symbolDataGridViewTextBoxColumn";
//
// patternDataGridViewTextBoxColumn
//
this.patternDataGridViewTextBoxColumn.DataPropertyName = "Pattern";
this.patternDataGridViewTextBoxColumn.HeaderText = "Pattern";
this.patternDataGridViewTextBoxColumn.Name = "patternDataGridViewTextBoxColumn";
//
// groupsDataGridViewTextBoxColumn
//
this.groupsDataGridViewTextBoxColumn.DataPropertyName = "Groups";
this.groupsDataGridViewTextBoxColumn.HeaderText = "Groups";
this.groupsDataGridViewTextBoxColumn.Name = "groupsDataGridViewTextBoxColumn";
//
// isEnableDataGridViewCheckBoxColumn
//
this.isEnableDataGridViewCheckBoxColumn.DataPropertyName = "IsEnable";
this.isEnableDataGridViewCheckBoxColumn.HeaderText = "IsEnable";
this.isEnableDataGridViewCheckBoxColumn.Name = "isEnableDataGridViewCheckBoxColumn";
//
// isTrustDataGridViewCheckBoxColumn
//
this.isTrustDataGridViewCheckBoxColumn.DataPropertyName = "IsTrust";
this.isTrustDataGridViewCheckBoxColumn.HeaderText = "IsTrust";
this.isTrustDataGridViewCheckBoxColumn.Name = "isTrustDataGridViewCheckBoxColumn";
//
// isAmkStdDataGridViewCheckBoxColumn
//
this.isAmkStdDataGridViewCheckBoxColumn.DataPropertyName = "IsAmkStd";
this.isAmkStdDataGridViewCheckBoxColumn.HeaderText = "IsAmkStd";
this.isAmkStdDataGridViewCheckBoxColumn.Name = "isAmkStdDataGridViewCheckBoxColumn";
//
// isIgnoreDataGridViewCheckBoxColumn
//
this.isIgnoreDataGridViewCheckBoxColumn.DataPropertyName = "IsIgnore";
this.isIgnoreDataGridViewCheckBoxColumn.HeaderText = "IsIgnore";
this.isIgnoreDataGridViewCheckBoxColumn.Name = "isIgnoreDataGridViewCheckBoxColumn";
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 122F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.textBox1, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox2, 1, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 486);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(784, 50);
this.tableLayoutPanel1.TabIndex = 4;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Location = new System.Drawing.Point(3, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(116, 25);
this.label1.TabIndex = 0;
this.label1.Text = "Pattern";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Location = new System.Drawing.Point(3, 25);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(116, 25);
this.label2.TabIndex = 0;
this.label2.Text = "Groups";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Pattern", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(125, 3);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(656, 21);
this.textBox1.TabIndex = 1;
//
// textBox2
//
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Groups", true));
this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox2.Location = new System.Drawing.Point(125, 28);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(656, 21);
this.textBox2.TabIndex = 1;
//
// RegExPrintRule
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(784, 561);
this.Controls.Add(this.component_Reel_RegExRuleDataGridView);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.bn);
this.Name = "RegExPrintRule";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "RegExRule";
this.Load += new System.EventHandler(this.RegExRule_Load);
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.component_Reel_RegExRuleDataGridView)).EndInit();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private DataSet1 dataSet1;
private System.Windows.Forms.BindingSource bs;
private DataSet1TableAdapters.TableAdapterManager tam;
private System.Windows.Forms.BindingNavigator bn;
private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
private System.Windows.Forms.ToolStripButton component_Reel_RegExRuleBindingNavigatorSaveItem;
private System.Windows.Forms.DataGridView component_Reel_RegExRuleDataGridView;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox2;
private DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter ta;
private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn seqDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn custCodeDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn symbolDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn patternDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn groupsDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn isEnableDataGridViewCheckBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn isTrustDataGridViewCheckBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn isAmkStdDataGridViewCheckBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn isIgnoreDataGridViewCheckBoxColumn;
}
}

View File

@@ -1,63 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Project.Dialog
{
public partial class RegExPrintRule : Form
{
public RegExPrintRule()
{
InitializeComponent();
this.KeyPreview = true;
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.Escape) this.Close();
};
}
private void RegExRule_Load(object sender, EventArgs e)
{
RefreshList();
}
private void component_Reel_RegExRuleBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();
this.bs.EndEdit();
this.tam.UpdateAll(this.dataSet1);
var modelName = PUB.Result.vModel.Title;
PUB.Result.BCDPrintPattern = PUB.GetPrintPatterns();
PUB.log.Add($"Model print pattern loading: {PUB.Result.BCDPrintPattern.Count}");
}
private void RefreshList()
{
try
{
this.ta.Fill(this.dataSet1.K4EE_Component_Reel_PrintRegExRule);
component_Reel_RegExRuleDataGridView.AutoResizeColumns();
}
catch (System.Exception ex)
{
System.Windows.Forms.MessageBox.Show(ex.Message);
}
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
RefreshList();
}
}
}

View File

@@ -1,222 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="dataSet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>117, 17</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>181, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>320, 17</value>
</metadata>
<metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>254, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
/5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
rkJggg==
</value>
</data>
<data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
</value>
</data>
<data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
</value>
</data>
<data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
</value>
</data>
<data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
oAc0QjgAAAAASUVORK5CYII=
</value>
</data>
<data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value>
</data>
<data name="component_Reel_RegExRuleBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
</root>

View File

@@ -180,7 +180,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "Position";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -439,7 +438,6 @@
this.tam.K4EE_Component_Reel_CustInfoTableAdapter = null;
this.tam.K4EE_Component_Reel_PreSetTableAdapter = null;
this.tam.K4EE_Component_Reel_Print_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_PrintRegExRuleTableAdapter = null;
this.tam.K4EE_Component_Reel_RegExRuleTableAdapter = this.ta;
this.tam.K4EE_Component_Reel_ResultTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_ConvertTableAdapter = null;

View File

@@ -4,11 +4,9 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.Entity.Infrastructure.MappingViews;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.ServiceModel;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@@ -105,6 +103,7 @@ namespace Project.Dialog
{
try
{
if (cust == "ALL")
{
dvcModelName.Visible = true;
@@ -137,7 +136,9 @@ namespace Project.Dialog
private void toolStripButton1_Click(object sender, EventArgs e)
{
RefreshList(PUB.Result.vModel.Title);
var title = cmbModelList.Text;
if (title.isEmpty()) title = PUB.Result.vModel.Title;
RefreshList(title);
}
private void bs_CurrentChanged(object sender, EventArgs e)
@@ -232,6 +233,71 @@ namespace Project.Dialog
RefreshList(title);
}
private string ChoiceModelName()
{
var cmb = new ComboBox();
cmb.Items.Clear();
foreach (var dr in PUB.mdm.dataSet.OPModel.OrderBy(t => t.Title))
cmb.Items.Add(dr.Title);
using (var f = new Form())
{
var lb = new Label()
{
Text = "Select Model",
Dock = DockStyle.Top
};
var pan = new Panel()
{
Dock = DockStyle.Bottom,
Height = 50,
};
var butok = new Button
{
Text = "OK",
Width = 160,
Dock = DockStyle.Fill,
};
var butng = new Button
{
Text = "Cancel",
Width = 160,
Dock = DockStyle.Right,
};
butok.Click += (s1, e1) => {
f.DialogResult = DialogResult.OK;
};
butng.Click += (s1, e1) => {
f.DialogResult = DialogResult.Cancel;
};
pan.Controls.Add(butok);
pan.Controls.Add(butng);
cmb.DropDownStyle = ComboBoxStyle.DropDownList;
cmb.Dock = DockStyle.Top;
f.StartPosition = FormStartPosition.CenterScreen;
f.Width = 320;
f.Height = 160;
f.Text = "Select Model";
f.MinimizeBox = false;
f.MaximizeBox = false;
f.Padding = new Padding(10);
f.Controls.Add(pan);
f.Controls.Add(cmb);
f.Controls.Add(lb);
if (f.ShowDialog() == DialogResult.OK)
{
return cmb.Text;
}
else return string.Empty;
}
}
private void btCopy_Click(object sender, EventArgs e)
{
try
@@ -246,13 +312,13 @@ namespace Project.Dialog
var sourceRow = drv.Row as DataSet1.K4EE_Component_Reel_RegExRuleRow;
if (sourceRow == null) return;
var inputDialog = AR.UTIL.InputBox("Input ModelName", sourceRow.IsCustCodeNull() ? "" : sourceRow.CustCode);
if (inputDialog.Item1 == false) return;
var newModelName = inputDialog.Item2;
var inputDialog = ChoiceModelName(); // AR.UTIL.InputBox("Input ModelName", sourceRow.IsCustCodeNull() ? "" : sourceRow.CustCode);
if (inputDialog.isEmpty()) return;
var newModelName = inputDialog;
var inputDialog2 = AR.UTIL.InputBox("Input Description", sourceRow.IsDescriptionNull() ? "" : sourceRow.Description);
if (inputDialog2.Item1 == false) return;
var newDescription = inputDialog2.Item2;
//var inputDialog2 = AR.UTIL.InputBox("Input Description", sourceRow.IsDescriptionNull() ? "" : sourceRow.Description);
//if (inputDialog2.Item1 == false) return;
var newDescription = sourceRow.IsDescriptionNull() ? "" : sourceRow.Description;// inputDialog2.Item2;
var tacheck = new DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter();
if (tacheck.CheckExsist(newModelName, newDescription) > 0)

View File

@@ -201,20 +201,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL6SURBVDhPhZLbT9NgGMZ3pX+CQS+8NBqF4IwavVAmh4HG
MwpBZMAYBARdYB4SFTOmqIiCBJaoMRKNF2qMhzHUATLGZIvDeJyKiMjJgM6NdW23tvPxa7cwTEh8k1++
i6/PL32fViZOynGrakudw7LtguN3Rq2DIScrUS+eTnZbXR+bcc7+fr3O1rgs8848KTR70k/32qb87K9J
LyV4AkF4qBi//CIsPk74ceLRCFSXPtHKcvP8aDQym8/apzzTtNA3zMH5nYdzhIdjmIf9WwjWL0E8cQcQ
5AHTJwYnHnxH4WU3848kzWBlpukQ+kcFvBrlycnjpSQJoWcwiGdumgjC6J8Q4BznYDCPQHGs67YUzqpP
GtpTm/lH07ILhc270fy0FTX366GojkcSQWlYhxT9ajSYGqRVKJbHpJdGyrEeXhLsrVPc63rXhraBa2h2
VEmSvKYMVN3KRUVrNtTG7SgwFsD0ZhJt7yk8fjsNH+kpVd/LSgJlo3L+1jMHBcfnbtx8p8d5a7kkUbVs
JuEdKLlSDNtgQFqlc4CBhfTgDXBIrXkREYiTfraH1V7Ph2vQDqPzMGo7KpFVvwmqpky4hmm4SLFiwbav
kU48RJCinyXYcLKaW3N0MXIblej/2gdDdyn0Zi2yLyaj1foQr8d4uEixfd84vCBM+TkoTkUFK3VxGrlu
ESpu5GBfSzpyGtIkidacC939YvImyRDv+0cEvBQ/McFPilx3xB4RyHULxuS6heShOMir4rDzfDLKrubD
5rbAYDmK0rv5ULfshYsInOTfcBABy4WxWmuNrbDxSC874WPxZkyQ6Pk8jkPXS1BEghpjNipvHJi5E6FD
AhIPPosJ1lRa2VFPTPA/AmSFhGJzTLBW+5wemPD9mevhuaCYYHhFnomKxkmRJR1D49O0f+CHPzz0k8HQ
FIPBKD8pTkJsnmIFeCk2HAyFfEv2t3+IxmWyVSVPyxLUTzoSNRZPgqaNnaEoQnyRKYLaxC5Vt3uXF7R3
xuebC2UymewvcCKiNqMNhYIAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s
ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz
vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud
t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA
7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx
s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA
lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw
SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O
bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch
98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec
1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H
cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss
RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS
dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="IsIgnore.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -57,14 +57,14 @@ namespace Project.Dialog
{
var reel = new Class.Reel(textBox1.Text);
PUB.PrinterL.Print(reel, true, AR.SETTING.Data.DrawOutbox);
PUB.log.Add("임시프린트L:" + textBox1.Text);
PUB.log.Add("Temporary print L:" + textBox1.Text);
}
private void button3_Click(object sender, EventArgs e)
{
var reel = new Class.Reel(textBox2.Text);
PUB.PrinterR.Print(reel, true, AR.SETTING.Data.DrawOutbox);
PUB.log.Add("임시프린트R:" + textBox2.Text);
PUB.log.Add("Temporary print R:" + textBox2.Text);
}
private void button4_Click(object sender, EventArgs e)

View File

@@ -49,7 +49,6 @@
this.btSearch = new System.Windows.Forms.Button();
this.cm = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewXMLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.sendDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tbFind = new System.Windows.Forms.TextBox();
@@ -191,8 +190,7 @@
// cm
//
this.cm.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.viewXMLToolStripMenuItem,
this.ToolStripMenuItem,
this.toolStripMenuItem1,
this.sendDataToolStripMenuItem});
this.cm.Name = "cm";
@@ -206,13 +204,6 @@
this.ToolStripMenuItem.Text = "Export";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// viewXMLToolStripMenuItem
//
this.viewXMLToolStripMenuItem.Name = "viewXMLToolStripMenuItem";
this.viewXMLToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
this.viewXMLToolStripMenuItem.Text = "View XML";
this.viewXMLToolStripMenuItem.Click += new System.EventHandler(this.viewXMLToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
@@ -299,7 +290,6 @@
this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dv.Size = new System.Drawing.Size(954, 468);
this.dv.TabIndex = 2;
this.dv.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv_CellDoubleClick);
//
// sTIMEDataGridViewTextBoxColumn
//
@@ -527,7 +517,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem sendDataToolStripMenuItem;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripMenuItem viewXMLToolStripMenuItem;
private DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter ta;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Button button1;

View File

@@ -65,47 +65,6 @@ namespace Project.Dialog
}
//public void ApplyZplCode()
//{
// string zplfil = string.Empty;
// var basedir = new System.IO.DirectoryInfo(Util.CurrentPath);
// if (SETTING.Data.PrinterForm7)
// {
// zplfil = System.IO.Path.Combine(basedir.Parent.FullName, "zpl7.txt");
// }
// else
// {
// zplfil = System.IO.Path.Combine(basedir.Parent.FullName, "zpl.txt");
// }
// if (System.IO.File.Exists(zplfil))
// {
// PrinterL.baseZPL = System.IO.File.ReadAllText(zplfil, System.Text.Encoding.Default);
// }
// else
// {
// Pub.log.AddAT("기본 ZPL파일이 없어 설정파일의 내용을 사용합니다");
// if (SETTING.Data.PrinterForm7)
// {
// PrinterL.baseZPL = Properties.Settings.Default.ZPL7;
// }
// else
// {
// PrinterL.baseZPL = Properties.Settings.Default.ZPL;
// }
// }
//}
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
// cmbUser.Enabled = checkBox5.Checked;
// if(cmbUser.Enabled && cmbUser.Text.isEmpty())
// {
// cmbUser.Text = string.Format("{0}({1})", Pub.LoginName, Pub.LoginNo);
// }
}
void refreshList()
{
//검색일자 검색
@@ -247,23 +206,6 @@ namespace Project.Dialog
saveXLS();
}
private void label2_Click(object sender, EventArgs e)
{
}
private void viewXMLToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void dv_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
{
}
private void sendDataToolStripMenuItem_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
@@ -275,9 +217,7 @@ namespace Project.Dialog
f.ShowDialog();
}
}
private void button1_Click(object sender, EventArgs e)
{

View File

@@ -907,7 +907,7 @@ namespace Project.Dialog
//If numbers are different?
if (UTIL.MsgQ(string.Format("Do you want to change the quantity?\nCurrent: {0}\nServer: {1}", tbQTY.Text, newCnt)) == DialogResult.Yes)
{
PUB.log.Add($"수량업데이트 {tbQTY.Text}->{newCnt}");
PUB.log.Add($"Quantity updated {tbQTY.Text}->{newCnt}");
tbQTY.Text = newCnt.ToString();
}
}
@@ -1248,13 +1248,13 @@ namespace Project.Dialog
if (amksid.isEmpty() == false)
{
PUB.log.Add(string.Format("amkor SId찾기 code={0},part={1},sid={2}", custcode, partno, amksid));
PUB.log.Add(string.Format("Amkor SID search code={0},part={1},sid={2}", custcode, partno, amksid));
tbSID.Text = amksid;
UpdateSID();
}
else
{
PUB.log.Add(string.Format("검색된 SID가 없어 sid찾기가 실패 했습니다\n" +
PUB.log.Add(string.Format("SID search failed - no SID found\n" +
"Cust:{0}\n" +
"PartNo:{1}", custcode, partno));
}
@@ -1307,7 +1307,7 @@ namespace Project.Dialog
{
this.tbCustName.Text = f.CustName;
this.TbCustCode.Text = f.CustCode;
PUB.log.Add(string.Format("사용자가 Customer 를 직접 선택함 {0}:{1}", tbCustName.Text, TbCustCode.Text));
PUB.log.Add(string.Format("User directly selected Customer {0}:{1}", tbCustName.Text, TbCustCode.Text));
}
}
@@ -1368,7 +1368,7 @@ namespace Project.Dialog
{
if (item.Value.Data == bcddata)
{
PUB.log.Add(string.Format("회전 기준 바코드값 {0}", item.Value.Data));
PUB.log.Add(string.Format("Rotation reference barcode value {0}", item.Value.Data));
item.Value.UserActive = true;
}
else item.Value.UserActive = false;
@@ -1564,7 +1564,7 @@ namespace Project.Dialog
if (VAR.BOOL[eVarBool.Opt_Conv_Apply_QtyMax]) columns.Add("qtymax", tbQtyMax.Text);
if (VAR.BOOL[eVarBool.Opt_Conv_Apply_SID]) columns.Add("SIDFrom", lbSID0.Text.Trim()); //250106
PUB.log.Add($"sid변환정보 저장컬럼:{string.Join(",", columns)},where:{string.Join("',", wheres)}");
PUB.log.Add($"SID conversion info save columns:{string.Join(",", columns)},where:{string.Join("',", wheres)}");
ServerWriteCONVINF(columns, wheres);
}
else PUB.log.AddI($"Seed conversion information(detailed) will not be saved");
@@ -2165,7 +2165,7 @@ namespace Project.Dialog
{
msg += (msg.isEmpty() ? "" : "\n") + string.Format("QTY:{0}=>{1}", tbQTY.Text, amk.QTY);
PUB.log.Add($"수량업데이트 {tbQTY.Text}->{amk.QTY}");
PUB.log.Add($"Quantity updated {tbQTY.Text}->{amk.QTY}");
tbQTY.Text = amk.QTY.ToString();
}
@@ -2301,7 +2301,7 @@ namespace Project.Dialog
if (tbBatch.Text.isEmpty())
{
tbBatch.Text = batch;
PUB.log.Add($"사용자 바코드 입력으로 batch값을 설정 합니다:{batch}");
PUB.log.Add($"Set batch value from user barcode input:{batch}");
}
@@ -2309,7 +2309,7 @@ namespace Project.Dialog
{
tbSID.Text = sid;
tbpartno.Text = cpn;
PUB.log.Add($"사용자 바코드로 SID/파트번호를 입력입니다 값:{sid}{cpn}");
PUB.log.Add($"Enter SID/Part number from user barcode, value:{sid}{cpn}");
}
else
{
@@ -2320,7 +2320,7 @@ namespace Project.Dialog
{
//맞다
tbpartno.Text = cpn;
PUB.log.Add($"사용자 바코드로 파트번호를 입력입니다 값:{cpn}");
PUB.log.Add($"Enter part number from user barcode, value:{cpn}");
}
else
{
@@ -2334,7 +2334,7 @@ namespace Project.Dialog
tbSID.Tag = tbSID.Text.Trim();
tbSID.Text = sid;
tbpartno.Text = cpn;
PUB.log.Add($"사용자 바코드로 SID/파트번호를 입력입니다 값:{sid}{cpn}");
PUB.log.Add($"Enter SID/Part number from user barcode, value:{sid}{cpn}");
}
}
}

View File

@@ -9,7 +9,6 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls.WebParts;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;

View File

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
using System.Data.SqlClient;
using System.Data;
using AR;
using System.Web.UI.WebControls;
namespace Project
{

View File

@@ -12,7 +12,7 @@ namespace Project.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

View File

@@ -49,7 +49,7 @@
</Setting>
<Setting Name="CS" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -57,7 +57,7 @@
</Setting>
<Setting Name="WMS_DEV" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -65,7 +65,7 @@
</Setting>
<Setting Name="WMS_PRD" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=V1SPCSQL,51122;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password="2!x2$yY8R;}$";Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>

View File

@@ -16,7 +16,7 @@
이전 버전과의 호환성을 위해 응용 프로그램에 가상화가 필요한 경우
이 요소를 제거합니다.
-->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
<applicationRequestMinimum>
<defaultAssemblyRequest permissionSetReference="Custom" />

View File

@@ -1,6 +1,5 @@
using AR;
using Emgu.CV.BgSegm;
using Microsoft.Owin.StaticFiles;
using System;
using System.Collections.Generic;
using System.Data;
@@ -41,21 +40,14 @@ namespace Project
public static Device.SATOPrinterAPI PrinterL;
public static Device.SATOPrinterAPI PrinterR;
public static arDev.Joystick.JoystickRaw joypad;
public static WatsonWebsocket.WatsonWsClient wsL;
public static WatsonWebsocket.WatsonWsClient wsR;
public static arDev.Joystick.JoystickRaw joystick;
//public static StdLabelPrint.LabelPrint PrinterL = null;
//public static StdLabelPrint.LabelPrint PrinterR = null;
public static Device.KeyenceBarcode keyenceF = null;
public static Device.KeyenceBarcode keyenceR = null;
public static int uploadcount = 0;
public static DateTime BuzzerTime;
public static DateTime MGZRunTime;
//public static Flag flag;
public static MessageWindow popup;
//interlock check
@@ -233,8 +225,8 @@ namespace Project
//Initialize
PUB.Result.vModel.Title = string.Empty;
PUB.PrinterL.ZPLFileName = "zpl.txt"; //Set as default file
PUB.PrinterR.ZPLFileName = "zpl.txt";
PUB.PrinterL.ZPLFileName = UTIL.MakePath("Data", "zpl.txt"); //Set as default file
PUB.PrinterR.ZPLFileName = UTIL.MakePath("Data", "zpl.txt");
var modelVision = PUB.mdm.GetDataV(modelName);
if (modelVision != null)
@@ -252,7 +244,6 @@ namespace Project
PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false);
PUB.Result.BCDIgnorePattern = PUB.GetPatterns(modelName, true);
PUB.Result.BCDPrintPattern = PUB.GetPrintPatterns(); //220902
PUB.log.Add($"Model pattern loading:{PUB.Result.BCDPattern.Count}/{PUB.Result.BCDIgnorePattern.Count}");
if (modelVision.Code.isEmpty())
@@ -276,8 +267,8 @@ namespace Project
if (bUploadConfig)
{
//SAVE
UpLoadBarcodeConfig(PUB.keyenceF);
UpLoadBarcodeConfig(PUB.keyenceR);
var k1 = MemLoadBarcodeConfig(PUB.keyenceF);
var k2 = MemLoadBarcodeConfig(PUB.keyenceR);
}
if (mv.bOwnZPL)
@@ -296,7 +287,7 @@ namespace Project
}
else
{
PUB.log.AddI($"Using shared ZPL file");
PUB.log.AddI($"Using shared ZPL file ({PUB.PrinterL.ZPLFileName})");
}
return true;
}
@@ -309,9 +300,48 @@ namespace Project
}
}
public static bool MemLoadBarcodeConfig(Device.KeyenceBarcode keyence)
{
var BarcodeMemoryNo = PUB.Result.vModel.BSave;
if (BarcodeMemoryNo < 0)
{
PUB.log.AddAT($"The currently selected model does not have a barcode memory number specified.");
return false;
}
if (keyence == null || keyence.IsConnect == false)
{
var tagstr = keyence?.Tag ?? string.Empty;
PUB.log.AddAT($"Barcode ({tagstr}) is not connected, configuration file will not be uploaded." +
"This information will be retransmitted when starting a new job." +
$"This error will not occur if you select the model after checking the barcode connection at the {(tagstr == "F" ? "left" : "right")} bottom.");
return false;
}
try
{
//접속되어잇ㅇ츠면 끈다
var isTriggeronL = keyence.IsTriggerOn;
if (keyence.IsConnect)
{
keyence.Trigger(false);
keyence.BLoad(BarcodeMemoryNo);
}
if (isTriggeronL && keyence.IsConnect) keyence.Trigger(true);
return true;
}
catch (Exception ex)
{
PUB.log.AddE($"Barcode({keyence.Tag}) FTP transfer failed:{ex.Message}");
}
return false;
}
public static bool UpLoadBarcodeConfig(Device.KeyenceBarcode keyence)
{
if (keyence == null || keyence.IsConnect == false)
{
var tagstr = keyence?.Tag ?? string.Empty;
@@ -386,7 +416,7 @@ namespace Project
//기존 SID정보에서 데이터를 취합니다.
var mc = AR.SETTING.Data.McName;
PUB.log.AddAT($"ECS SKIP is set in configuration. Data will be generated from existing information MC={mc}");
PUB.log.AddAT($"SID Information Data will be generated from existing information MC={mc}");
using (var tainfo = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{
var cntd = tainfo.DeleteAll("IB");
@@ -394,12 +424,12 @@ namespace Project
var cnti = tainfo.MakeIBData(mc);
PUB.log.AddAT($"{cnti} records duplicated");
}
message = "ECS-OFF 됨 장비전용 데이터로 진행 함";
message = "SID Information : Only M/C Data";
result = true;
rdy = 1;
wat.Stop();
PUB.log.Add($"{cnt}건의 sid정보가 추가됨 {wat.ElapsedMilliseconds:N2}ms");
PUB.log.Add($"SID Information Add ({cnt}) - {wat.ElapsedMilliseconds:N2}ms");
return new Tuple<bool, string, int>(result, message, rdy);
});
return rlt;
@@ -455,7 +485,7 @@ namespace Project
PUB.Result.DTSidConvert.AcceptChanges();
PUB.Result.DTSidConvertEmptyList.Clear();
PUB.Result.DTSidConvertMultiList.Clear();
PUB.log.Add($"sid변환테이블 {PUB.Result.DTSidConvert.Rows.Count}건 확인");
PUB.log.Add($"SID conversion table {PUB.Result.DTSidConvert.Rows.Count} records checked");
return true;
}
catch (Exception ex)
@@ -648,7 +678,7 @@ namespace Project
GetSIDConverDB();
if (PUB.Result.DTSidConvert.Any())
{
PUB.log.Add($"[{src}] sid변환테이블조회결과 {PUB.Result.DTSidConvert.Rows.Count}");
PUB.log.Add($"[{src}] SID conversion table query result: {PUB.Result.DTSidConvert.Rows.Count} records");
VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] = false;
}
else
@@ -666,7 +696,7 @@ namespace Project
if (PUB.sm.Step == eSMStep.RUN)
PUB.log.Add($"[{src}] sid변환작업시작 원본:{oldsid}");
PUB.log.Add($"[{src}] SID conversion work started, original:{oldsid}");
var sidconvlist = PUB.Result.DTSidConvert.Where(t => t.SIDFrom.Equals(oldsid));
if (sidconvlist.Any() == false)
@@ -1019,65 +1049,6 @@ namespace Project
return patterns;
}
public static List<Class.RegexPattern> GetPrintPatterns()
{
var patterns = new List<Class.RegexPattern>();
//if (custname.isEmpty()) custname = "%";
//데이터베이스에서 해당 데이터를 가져온다
if (AR.SETTING.Data.OnlineMode)
{
try
{
using (var ta = new DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter())
{
ta.ClearBeforeFill = true;
ta.Fill(PUB.mdm.dataSet.K4EE_Component_Reel_PrintRegExRule);
PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule.AcceptChanges();
}
}
catch (Exception ex)
{
PUB.log.AddE(ex.Message);
}
}
//data
foreach (DataSet1.K4EE_Component_Reel_PrintRegExRuleRow dr in PUB.mdm.dataSet.K4EE_Component_Reel_PrintRegExRule)
{
if (dr.Groups.isEmpty() || dr.Pattern.isEmpty()) continue;
var groupsbuf = dr.Groups.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
var Groups = new List<Class.RegexGroupMatch>();
foreach (var item in groupsbuf)
{
var itembuf = item.Split('=');
Groups.Add(new Class.RegexGroupMatch
{
GroupNo = int.Parse(itembuf[1].Trim()),
TargetPos = itembuf[0].Trim(),
});
}
//add pattern data
patterns.Add(new Class.RegexPattern
{
Seq = dr.Seq,
Customer = dr.CustCode,
Description = dr.Description,
Symbol = dr.Symbol,
Pattern = dr.Pattern,
Groups = Groups.ToArray(),
});
}
return patterns;
}
public static int RemoveCache(string basefile)
{
var fi = new System.IO.FileInfo(basefile);
@@ -1093,7 +1064,7 @@ namespace Project
{
foreach (var delFile in delFiles)
{
PUB.log.Add("보관파일삭제: " + delFile.FullName);
PUB.log.Add("Archive file deleted: " + delFile.FullName);
delFile.Delete();
cnt += 1;
}
@@ -1129,7 +1100,7 @@ namespace Project
{
system_mot = new System_MotParameter(UTIL.MakePath("System_mot.xml"));
system_mot.Load();
//setting
SETTING.Load();
VAR.Init(LenI32: 128, LenBool: 192);
@@ -1151,7 +1122,7 @@ namespace Project
popup.WindowOpen += popup_WindowOpen;
//zpl파일 만든다.
var fn = Path.Combine(UTIL.CurrentPath, "zpl.txt");
var fn = Path.Combine(UTIL.CurrentPath, "Data", "zpl.txt");
if (File.Exists(fn) == false)
File.WriteAllText(fn, Properties.Settings.Default.ZPL7, Encoding.Default);
}
@@ -1579,7 +1550,7 @@ namespace Project
else if (fi.Directory.Exists == false) fi.Directory.Create();
DTUserSID.AcceptChanges();
PUB.log.Add("사용자 SID 목록 : " + DTUserSID.Count.ToString() + " 건 불러옴");
PUB.log.Add("User SID list: " + DTUserSID.Count.ToString() + " records loaded");
}
public static void SaveSIDList()
{
@@ -1606,7 +1577,7 @@ namespace Project
cnt += 1;
}
System.IO.File.WriteAllText(fi.FullName, sb.ToString(), System.Text.Encoding.UTF8);
PUB.log.Add(string.Format("{0}건의 사용자 sid가 저장되었습니다", cnt));
PUB.log.Add(string.Format("{0} user SIDs have been saved", cnt));
}
}

View File

@@ -11,164 +11,6 @@ namespace Project
public partial class FMain
{
private void Joystick_InputChanged(object sender, arDev.Joystick.JoystickRaw.InputChangedEventHandler e)
{
var keyName = e.input.ToString();
if (e.input == HidSharp.Reports.Usage.Button5) keyName = "L-TRIGGER";
else if (e.input == HidSharp.Reports.Usage.Button6) keyName = "R-TRIGGER";
else if (e.input == HidSharp.Reports.Usage.Button9) keyName = "SELECT";
else if (e.input == HidSharp.Reports.Usage.Button10) keyName = "START";
else if (e.input == HidSharp.Reports.Usage.Button4) keyName = "BUT-Y";
else if (e.input == HidSharp.Reports.Usage.Button1) keyName = "BUT-X";
PUB.log.Add("JOYSTICK", string.Format("[{0}] {1}->{2}", keyName, e.oldValue, e.newValue));
if (PUB.sm.Step != eSMStep.IDLE && PUB.sm.Step != eSMStep.ERROR && PUB.flag.get(eVarBool.FG_MOVE_PICKER) == false && PUB.sm.Step != eSMStep.WAITSTART) return;
if (e.input == HidSharp.Reports.Usage.Button4) //stop
{
if (e.newValue > 0)
{
PUB.log.Add("Joystick Click : Stop");
_BUTTON_STOP();
}
}
else if (e.input == HidSharp.Reports.Usage.Button1) //reset
{
if (e.newValue > 0)
{
PUB.log.Add("Joystick Click : Reset");
_BUTTON_RESET();
}
}
else if (e.input == HidSharp.Reports.Usage.Button9) //select button
{
if (e.newValue == 1)
{
PUB.Result.JoystickAxisGroup += 1;
if (PUB.Result.JoystickAxisGroup > 3) PUB.Result.JoystickAxisGroup = 0;
}
}
else if (e.input == HidSharp.Reports.Usage.Button10) //start button
{
if (e.newValue == 1 && PUB.flag.get(eVarBool.FG_SCR_JOBSELECT) == false)
{
if (PUB.sm.Step >= eSMStep.IDLE)
{
PUB.log.AddI("START BUTTON");
this._BUTTON_START();
}
}
}
else if (e.input == HidSharp.Reports.Usage.Button5) //ltrigger
{
AR.SETTING.Data.Enable_SpeedLimit = true;
}
else if (e.input == HidSharp.Reports.Usage.Button6) //ltrigger
{
AR.SETTING.Data.Enable_SpeedLimit = false;
}
//트리거 L,R을 눌렀을때 홈 가능한 위치라면 홈을 진행한다
if (e.newValue > 0 && (e.input == HidSharp.Reports.Usage.Button5 || e.input == HidSharp.Reports.Usage.Button6))
{
//두개가 동시에 눌렷을때
if (PUB.joystick.Buttons[4] && PUB.joystick.Buttons[5])
{
if (PUB.flag.get(eVarBool.FG_INIT_MOTIO) == false) return;
if (PUB.sm.isRunning == true) return;
if (DIO.IsEmergencyOn() == true) return;
if (PUB.sm.Step == eSMStep.RUN) return;
PUB.log.AddAT("Home initialization operation with joystick");
Func_sw_initialize();
}
}
//동작중만 아니면 작동하게한다.
if (PUB.sm.Step != eSMStep.RUN)
{
short axisH = 0;
short axisV = 1;
if (PUB.Result.JoystickAxisGroup == 1) //왼쪽뭉치
{
axisH = 2;
axisV = 3;
}
else if (PUB.Result.JoystickAxisGroup == 2) //오른쪽뭉치
{
axisH = 4;
axisV = 5;
}
else if (PUB.Result.JoystickAxisGroup == 3) //theta, picker-Z
{
axisH = 6;
axisV = 1;
}
//X축으로 이동하는것은 PX,
if (e.input == HidSharp.Reports.Usage.GenericDesktopX)
{
if (e.newValue == 0)
{
//좌
PUB.mot.JOG(axisH, arDev.MOT.MOTION_DIRECTION.Negative, 100, 500, false, false);
PUB.flag.set(eVarBool.FG_JOYSTICK, true, "joystick");
}
else if (e.newValue == 127)
{
//멈춤
PUB.mot.MoveStop("Joystick", axisH);
PUB.flag.set(eVarBool.FG_JOYSTICK, false, "joystick");
}
else if (e.newValue == 255)
{
//우
PUB.mot.JOG(axisH, arDev.MOT.MOTION_DIRECTION.Positive, 100, 500, false, false);
PUB.flag.set(eVarBool.FG_JOYSTICK, true, "joystick");
}
}
else if (e.input == HidSharp.Reports.Usage.GenericDesktopY)
{
if (e.newValue == 0)
{
//상
PUB.mot.JOG(axisV, arDev.MOT.MOTION_DIRECTION.Negative, 100, 500, false, false);
PUB.flag.set(eVarBool.FG_JOYSTICK, true, "joystick");
}
else if (e.newValue == 127)
{
//멈춤
PUB.mot.MoveStop("Joystick", axisV);
PUB.flag.set(eVarBool.FG_JOYSTICK, false, "joystick");
}
else if (e.newValue == 255)
{
//하
PUB.mot.JOG(axisV, arDev.MOT.MOTION_DIRECTION.Positive, 100, 500, false, false);
PUB.flag.set(eVarBool.FG_JOYSTICK, true, "joystick");
}
}
}
}
private void Joystick_Disconnected(object sender, EventArgs e)
{
PUB.log.AddE("Joystick connection terminated");
}
private void Joystick_Connected(object sender, EventArgs e)
{
PUB.log.AddI("Joystick connection completed");
}
private void Joystick_Changed(object sender, EventArgs e)
{
PUB.log.AddAT("Joystick detected");
}
}
}

View File

@@ -133,9 +133,6 @@ namespace Project
hmi1.PrintLPICK = DIO.GetIOInput(eDIName.L_PICK_VAC);
hmi1.PrintRPICK = DIO.GetIOInput(eDIName.R_PICK_VAC);
hmi1.arJoystickGroup = PUB.Result.JoystickAxisGroup;
hmi1.arJoystickOn = PUB.joystick.IsOpen;
hmi1.arPortLItemOn = PUB.flag.get(eVarBool.FG_PORTL_ITEMON);
hmi1.arPortRItemOn = PUB.flag.get(eVarBool.FG_PORTR_ITEMON);

View File

@@ -135,7 +135,6 @@ namespace Project
var modelName = PUB.Result.vModel.Title;
PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false);
PUB.Result.BCDIgnorePattern = PUB.GetPatterns(modelName, true);
PUB.Result.BCDPrintPattern = PUB.GetPrintPatterns();
PUB.log.Add($"Model pattern loading: {PUB.Result.BCDPattern.Count}/{PUB.Result.BCDIgnorePattern.Count}");
//변환SID SID확인여부데이터 삭제

View File

@@ -160,8 +160,10 @@ namespace Project
//바코드설정업데이트
if (systembypassmode == false)
{
var k1 = PUB.UpLoadBarcodeConfig(PUB.keyenceF);
var k2 = PUB.UpLoadBarcodeConfig(PUB.keyenceR);
bool k1, k2;
k1 = PUB.MemLoadBarcodeConfig(PUB.keyenceF);
k2 = PUB.MemLoadBarcodeConfig(PUB.keyenceR);
if (k1 == false && k2 == false) //결과확인하도록함 230511
{
PUB.Result.SetResultMessage(eResult.HARDWARE, eECode.CONFIG_KEYENCE, eNextStep.ERROR);

View File

@@ -5,7 +5,6 @@ using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Security.Cryptography;
using System.Text;
using System.Web.UI.WebControls;
using AR;
using Chilkat;

View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Security.Cryptography;
using System.ServiceModel.Configuration;
using System.Text;
using AR;
using Project.Class;

View File

@@ -68,7 +68,7 @@ namespace Project
//####################################################
if (PUB.sm.seq.Get(cmdIndex) == idx++)
{
PUB.log.Add($"[{target}] 프린트 ON 작업 시작");
PUB.log.Add($"[{target}] Print ON operation started");
PUB.sm.seq.Update(cmdIndex);
return false;
}

View File

@@ -393,7 +393,7 @@ namespace Project
VAR.DBL[eVarDBL.RIGT_ITEM_PICKOFF] = 0;
VAR.I32[eVarInt32.RIGT_ITEM_COUNT] += 1;
}
PUB.log.Add($"[{target}] 릴을 내려놓습니다");
PUB.log.Add($"[{target}] Placing reel down");
PUB.sm.seq.Update(cmdIndex);

View File

@@ -171,7 +171,7 @@ namespace Project
}
DIO.SetPortMotor(idx, eMotDir.CCW, true, "얼라인(DN)");
PUB.log.Add("PORT", "포트를 강제로 하강 합니다");
PUB.log.Add("PORT", "Force port to descend");
}
//자재가 감지되면 시간을 다시 초기화해서 충분히 내려가도록 한다 210402
@@ -211,7 +211,7 @@ namespace Project
}
DIO.SetPortMotor(idx, eMotDir.CW, true, "MOT_PORT");
PUB.log.Add("PORT", "강제 상승(9에서 멈춰있음)");
PUB.log.Add("PORT", "Force ascend (stopped at position 9)");
}
}
}

View File

@@ -60,7 +60,7 @@ namespace Project
private void SM_StepCompleted(object sender, EventArgs e)
{
PUB.log.Add($"스텝완료({PUB.sm.Step})");
PUB.log.Add($"Step completed({PUB.sm.Step})");
//초기화가 완료되면 컨트롤 글자를 변경 해준다.
if (PUB.sm.Step == eSMStep.INIT)

View File

@@ -56,7 +56,7 @@ namespace Project
else
{
hmi1.ClearMessage();
PUB.log.Add($"정의되지 않은 STEP({step}) 시작");
PUB.log.Add($"Undefined STEP({step}) started");
}
if (step == eSMStep.HOME_QUICK || step == eSMStep.HOME_FULL || PUB.sm.getOldStep == eSMStep.IDLE || PUB.sm.getOldStep == eSMStep.FINISH)

View File

@@ -78,7 +78,7 @@ namespace Project
var regx = new Regex(pt.Pattern, RegexOptions.IgnoreCase, new TimeSpan(0, 0, 10));
if (regx.IsMatch(bcd))
{
PUB.log.Add($"무시바코드:{bcd},PAT:{pt.Pattern},SYM:{pt.Symbol}");
PUB.log.Add($"Ignore barcode:{bcd},PAT:{pt.Pattern},SYM:{pt.Symbol}");
IgnoreBarcode = true;
break;
}
@@ -118,7 +118,6 @@ namespace Project
var data = mat.Groups[matchdata.GroupNo];
if (PUB.SetBCDValue(vdata, matchdata.TargetPos, data.Value, pt.IsTrust))
ValueApplyCount += 1;
}
}
}
@@ -142,7 +141,6 @@ namespace Project
return new Tuple<int, List<string>>(ValueApplyCount, list);
}
/// <summary>
/// barcod eprocess
/// </summary>
@@ -174,7 +172,7 @@ namespace Project
bcdObj.Ignore = IgnoreBcd;
//기타바코드 무시기능 적용 221018
if (vm != null && vm.IgnoreOtherBarcode == true && findregex == false)
if (bcdObj.Ignore == false && vm != null && vm.IgnoreOtherBarcode == true && findregex == false)
bcdObj.Ignore = true;
bcdObj.RefExApply = (ValueApplyCount?.Item1 ?? 0) > 0;
@@ -182,6 +180,5 @@ namespace Project
}
}
}
}
}
}

View File

@@ -5,7 +5,6 @@ using System.Linq;
using System.Security.Cryptography;
using System.Text;
using AR;
using Microsoft.Owin.Hosting;
namespace Project
{
@@ -106,13 +105,6 @@ namespace Project
//조명 ON
DIO.SetRoomLight(true);
// Start OWIN host
var baseAddress = "http://*:9001";
WebApp.Start<OWIN.Startup>(url: baseAddress);
PUB.log.AddI($"Hosting service ON: {baseAddress}");
}
public StepResult _STEP_INIT(eSMStep step, TimeSpan stepTime, TimeSpan seqTime)

View File

@@ -127,43 +127,13 @@
<Reference Include="Emgu.CV.UI">
<HintPath>C:\Emgu\emgucv-windesktop 3.2.0.2682\bin\Emgu.CV.UI.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="HidSharp, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HidSharp.2.1.0\lib\net35\HidSharp.dll</HintPath>
</Reference>
<Reference Include="libxl.net, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\libxl\libxl.net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Cors, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Cors.4.2.2\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.FileSystems, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.FileSystems.4.2.2\lib\net45\Microsoft.Owin.FileSystems.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Hosting, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.StaticFiles, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.StaticFiles.4.2.2\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="SATOPrinterAPI">
<HintPath>..\DLL\Sato\x64\SATOPrinterAPI.dll</HintPath>
</Reference>
@@ -183,30 +153,9 @@
<Reference Include="System.Drawing.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Drawing.Primitives.4.3.0\lib\net45\System.Drawing.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Management" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Cors, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Cors.5.2.9\lib\net45\System.Web.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.Owin, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.9\lib\net45\System.Web.Http.Owin.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.9\lib\net45\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -218,7 +167,8 @@
<Reference Include="WatsonWebsocket">
<HintPath>..\DLL\WatsonWebsocket.dll</HintPath>
</Reference>
<Reference Include="Winsock Orcas">
<Reference Include="Winsock Orcas, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\Winsock Orcas.dll</HintPath>
</Reference>
</ItemGroup>
@@ -246,7 +196,6 @@
<Compile Include="Class\FTP\FTPdirectory.cs" />
<Compile Include="Class\FTP\FTPfileInfo.cs" />
<Compile Include="Class\FTP\IFTPClient.cs" />
<Compile Include="Class\JoystickRaw.cs" />
<Compile Include="Class\KeyenceBarcodeData.cs" />
<Compile Include="Class\Reel.cs" />
<Compile Include="Class\RegexPattern.cs" />
@@ -254,8 +203,6 @@
<Compile Include="Class\StatusMessage.cs" />
<Compile Include="Class\VisionData.cs" />
<Compile Include="Class\ItemData.cs" />
<Compile Include="Controller\ModelController.cs" />
<Compile Include="Controller\StateController.cs" />
<Compile Include="DataSet11.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -413,12 +360,6 @@
<Compile Include="Dialog\Motion_MoveToGroup.Designer.cs">
<DependentUpon>Motion_MoveToGroup.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\RegExPrintRule.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\RegExPrintRule.Designer.cs">
<DependentUpon>RegExPrintRule.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\RegExRule.cs">
<SubType>Form</SubType>
</Compile>
@@ -661,7 +602,6 @@
<Compile Include="RunCode\RunSequence\_RUN_MOT_PORT.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StartupAPI.cs" />
<Compile Include="UIControl\CtlBase.cs" />
<Compile Include="UIControl\CtlBase.Designer.cs">
<DependentUpon>CtlBase.cs</DependentUpon>
@@ -818,9 +758,6 @@
<EmbeddedResource Include="Dialog\fSelectSID.resx">
<DependentUpon>fSelectSID.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\RegExPrintRule.resx">
<DependentUpon>RegExPrintRule.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\RegExRule.resx">
<DependentUpon>RegExRule.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -64,19 +64,13 @@
this.btCartDetR = new System.Windows.Forms.Button();
this.btCartDetL = new System.Windows.Forms.Button();
this.btCartDetC = new System.Windows.Forms.Button();
this.btdoorr3 = new System.Windows.Forms.Button();
this.btdoorr1 = new System.Windows.Forms.Button();
this.btdoorf3 = new System.Windows.Forms.Button();
this.btdoorr2 = new System.Windows.Forms.Button();
this.btdoorf1 = new System.Windows.Forms.Button();
this.btdoorf2 = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.bsLang = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.btDefIO = new System.Windows.Forms.Button();
this.btDefError = new System.Windows.Forms.Button();
this.btOpenZPL = new System.Windows.Forms.Button();
this.bsLang = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.bsRecipient = new System.Windows.Forms.BindingSource(this.components);
this.bsMailForm = new System.Windows.Forms.BindingSource(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
@@ -87,9 +81,9 @@
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsLang)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsRecipient)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsMailForm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).BeginInit();
@@ -183,13 +177,14 @@
this.groupBox1.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.groupBox1.Location = new System.Drawing.Point(5, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(596, 403);
this.groupBox1.Size = new System.Drawing.Size(596, 409);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Function Control";
//
// btSystemBypass
//
this.btSystemBypass.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btSystemBypass.Location = new System.Drawing.Point(53, 349);
this.btSystemBypass.Name = "btSystemBypass";
this.btSystemBypass.Size = new System.Drawing.Size(479, 42);
@@ -200,6 +195,7 @@
//
// button7
//
this.button7.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button7.Location = new System.Drawing.Point(230, 279);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(124, 43);
@@ -210,7 +206,7 @@
//
// btbuzAfterFinish
//
this.btbuzAfterFinish.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btbuzAfterFinish.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btbuzAfterFinish.Location = new System.Drawing.Point(18, 30);
this.btbuzAfterFinish.Name = "btbuzAfterFinish";
this.btbuzAfterFinish.Size = new System.Drawing.Size(135, 43);
@@ -221,6 +217,7 @@
//
// button13
//
this.button13.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button13.Location = new System.Drawing.Point(53, 215);
this.button13.Name = "button13";
this.button13.Size = new System.Drawing.Size(128, 42);
@@ -231,6 +228,7 @@
//
// button14
//
this.button14.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button14.Location = new System.Drawing.Point(404, 213);
this.button14.Name = "button14";
this.button14.Size = new System.Drawing.Size(128, 42);
@@ -241,7 +239,7 @@
//
// button3
//
this.button3.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Bold);
this.button3.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button3.Location = new System.Drawing.Point(230, 89);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(124, 43);
@@ -252,6 +250,7 @@
//
// btmag2
//
this.btmag2.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btmag2.Location = new System.Drawing.Point(230, 233);
this.btmag2.Name = "btmag2";
this.btmag2.Size = new System.Drawing.Size(124, 43);
@@ -262,6 +261,7 @@
//
// btRoomLamp
//
this.btRoomLamp.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btRoomLamp.Location = new System.Drawing.Point(429, 30);
this.btRoomLamp.Name = "btRoomLamp";
this.btRoomLamp.Size = new System.Drawing.Size(135, 43);
@@ -272,7 +272,7 @@
//
// button6
//
this.button6.Font = new System.Drawing.Font("맑은 고딕", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button6.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button6.Location = new System.Drawing.Point(404, 75);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(163, 49);
@@ -283,6 +283,7 @@
//
// btPickerVac
//
this.btPickerVac.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPickerVac.Location = new System.Drawing.Point(230, 133);
this.btPickerVac.Name = "btPickerVac";
this.btPickerVac.Size = new System.Drawing.Size(124, 43);
@@ -293,6 +294,7 @@
//
// btPort1
//
this.btPort1.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPort1.ForeColor = System.Drawing.Color.Black;
this.btPort1.Location = new System.Drawing.Point(230, 187);
this.btPort1.Name = "btPort1";
@@ -304,6 +306,7 @@
//
// btmag1
//
this.btmag1.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btmag1.Location = new System.Drawing.Point(404, 299);
this.btmag1.Name = "btmag1";
this.btmag1.Size = new System.Drawing.Size(128, 42);
@@ -314,6 +317,7 @@
//
// btTWLamp
//
this.btTWLamp.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btTWLamp.Location = new System.Drawing.Point(292, 30);
this.btTWLamp.Name = "btTWLamp";
this.btTWLamp.Size = new System.Drawing.Size(135, 43);
@@ -324,6 +328,7 @@
//
// btBuz
//
this.btBuz.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btBuz.Location = new System.Drawing.Point(155, 30);
this.btBuz.Name = "btBuz";
this.btBuz.Size = new System.Drawing.Size(135, 43);
@@ -334,6 +339,7 @@
//
// btmag0
//
this.btmag0.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btmag0.Location = new System.Drawing.Point(53, 301);
this.btmag0.Name = "btmag0";
this.btmag0.Size = new System.Drawing.Size(128, 42);
@@ -344,7 +350,7 @@
//
// button5
//
this.button5.Font = new System.Drawing.Font("맑은 고딕", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button5.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.button5.Location = new System.Drawing.Point(18, 77);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(163, 49);
@@ -355,6 +361,7 @@
//
// btPort0
//
this.btPort0.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPort0.ForeColor = System.Drawing.Color.Black;
this.btPort0.Location = new System.Drawing.Point(53, 258);
this.btPort0.Name = "btPort0";
@@ -366,6 +373,7 @@
//
// btPort2
//
this.btPort2.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPort2.ForeColor = System.Drawing.Color.Black;
this.btPort2.Location = new System.Drawing.Point(404, 256);
this.btPort2.Name = "btPort2";
@@ -377,6 +385,7 @@
//
// btLeftVac
//
this.btLeftVac.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btLeftVac.Location = new System.Drawing.Point(53, 172);
this.btLeftVac.Name = "btLeftVac";
this.btLeftVac.Size = new System.Drawing.Size(128, 42);
@@ -387,6 +396,7 @@
//
// btPrintR
//
this.btPrintR.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPrintR.ForeColor = System.Drawing.Color.Black;
this.btPrintR.Location = new System.Drawing.Point(404, 127);
this.btPrintR.Name = "btPrintR";
@@ -398,6 +408,7 @@
//
// btPrintL
//
this.btPrintL.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btPrintL.ForeColor = System.Drawing.Color.Black;
this.btPrintL.Location = new System.Drawing.Point(53, 129);
this.btPrintL.Name = "btPrintL";
@@ -409,6 +420,7 @@
//
// btRightVac
//
this.btRightVac.Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold);
this.btRightVac.Location = new System.Drawing.Point(404, 170);
this.btRightVac.Name = "btRightVac";
this.btRightVac.Size = new System.Drawing.Size(128, 42);
@@ -424,17 +436,11 @@
this.groupBox2.Controls.Add(this.btCartDetR);
this.groupBox2.Controls.Add(this.btCartDetL);
this.groupBox2.Controls.Add(this.btCartDetC);
this.groupBox2.Controls.Add(this.btdoorr3);
this.groupBox2.Controls.Add(this.btdoorr1);
this.groupBox2.Controls.Add(this.btdoorf3);
this.groupBox2.Controls.Add(this.btdoorr2);
this.groupBox2.Controls.Add(this.btdoorf1);
this.groupBox2.Controls.Add(this.btdoorf2);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.groupBox2.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.groupBox2.Location = new System.Drawing.Point(5, 408);
this.groupBox2.Location = new System.Drawing.Point(5, 414);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(596, 177);
this.groupBox2.Size = new System.Drawing.Size(596, 171);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Sensor Control";
@@ -442,9 +448,9 @@
// btDetectPrintR
//
this.btDetectPrintR.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btDetectPrintR.Location = new System.Drawing.Point(466, 32);
this.btDetectPrintR.Location = new System.Drawing.Point(112, 38);
this.btDetectPrintR.Name = "btDetectPrintR";
this.btDetectPrintR.Size = new System.Drawing.Size(100, 43);
this.btDetectPrintR.Size = new System.Drawing.Size(100, 58);
this.btDetectPrintR.TabIndex = 24;
this.btDetectPrintR.Text = "Print Detect-R";
this.btDetectPrintR.UseVisualStyleBackColor = true;
@@ -453,9 +459,9 @@
// btDetectPrintL
//
this.btDetectPrintL.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btDetectPrintL.Location = new System.Drawing.Point(365, 32);
this.btDetectPrintL.Location = new System.Drawing.Point(12, 38);
this.btDetectPrintL.Name = "btDetectPrintL";
this.btDetectPrintL.Size = new System.Drawing.Size(100, 43);
this.btDetectPrintL.Size = new System.Drawing.Size(100, 58);
this.btDetectPrintL.TabIndex = 23;
this.btDetectPrintL.Text = "Print Detect-L";
this.btDetectPrintL.UseVisualStyleBackColor = true;
@@ -464,9 +470,9 @@
// btCartDetR
//
this.btCartDetR.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btCartDetR.Location = new System.Drawing.Point(219, 122);
this.btCartDetR.Location = new System.Drawing.Point(213, 99);
this.btCartDetR.Name = "btCartDetR";
this.btCartDetR.Size = new System.Drawing.Size(100, 43);
this.btCartDetR.Size = new System.Drawing.Size(100, 58);
this.btCartDetR.TabIndex = 20;
this.btCartDetR.Text = "Cart Detect(R)";
this.btCartDetR.UseVisualStyleBackColor = true;
@@ -475,9 +481,9 @@
// btCartDetL
//
this.btCartDetL.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btCartDetL.Location = new System.Drawing.Point(16, 122);
this.btCartDetL.Location = new System.Drawing.Point(12, 99);
this.btCartDetL.Name = "btCartDetL";
this.btCartDetL.Size = new System.Drawing.Size(100, 43);
this.btCartDetL.Size = new System.Drawing.Size(100, 58);
this.btCartDetL.TabIndex = 21;
this.btCartDetL.Text = "Cart Detect(L)";
this.btCartDetL.UseVisualStyleBackColor = true;
@@ -486,80 +492,14 @@
// btCartDetC
//
this.btCartDetC.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btCartDetC.Location = new System.Drawing.Point(118, 122);
this.btCartDetC.Location = new System.Drawing.Point(112, 99);
this.btCartDetC.Name = "btCartDetC";
this.btCartDetC.Size = new System.Drawing.Size(100, 43);
this.btCartDetC.Size = new System.Drawing.Size(100, 58);
this.btCartDetC.TabIndex = 22;
this.btCartDetC.Text = "Cart Detect(C)";
this.btCartDetC.UseVisualStyleBackColor = true;
this.btCartDetC.Click += new System.EventHandler(this.button7_Click);
//
// btdoorr3
//
this.btdoorr3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorr3.Location = new System.Drawing.Point(219, 32);
this.btdoorr3.Name = "btdoorr3";
this.btdoorr3.Size = new System.Drawing.Size(100, 43);
this.btdoorr3.TabIndex = 19;
this.btdoorr3.Text = "DOOR-R3";
this.btdoorr3.UseVisualStyleBackColor = true;
this.btdoorr3.Click += new System.EventHandler(this.btSafetyP3_Click);
//
// btdoorr1
//
this.btdoorr1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorr1.Location = new System.Drawing.Point(16, 32);
this.btdoorr1.Name = "btdoorr1";
this.btdoorr1.Size = new System.Drawing.Size(100, 43);
this.btdoorr1.TabIndex = 0;
this.btdoorr1.Text = "DOOR-R1";
this.btdoorr1.UseVisualStyleBackColor = true;
this.btdoorr1.Click += new System.EventHandler(this.button2_Click_1);
//
// btdoorf3
//
this.btdoorf3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorf3.Location = new System.Drawing.Point(219, 77);
this.btdoorf3.Name = "btdoorf3";
this.btdoorf3.Size = new System.Drawing.Size(100, 43);
this.btdoorf3.TabIndex = 2;
this.btdoorf3.Text = "DOOR-F3";
this.btdoorf3.UseVisualStyleBackColor = true;
this.btdoorf3.Click += new System.EventHandler(this.btLoaderDetect_Click);
//
// btdoorr2
//
this.btdoorr2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorr2.Location = new System.Drawing.Point(118, 32);
this.btdoorr2.Name = "btdoorr2";
this.btdoorr2.Size = new System.Drawing.Size(100, 43);
this.btdoorr2.TabIndex = 2;
this.btdoorr2.Text = "DOOR-R2";
this.btdoorr2.UseVisualStyleBackColor = true;
this.btdoorr2.Click += new System.EventHandler(this.button4_Click);
//
// btdoorf1
//
this.btdoorf1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorf1.Location = new System.Drawing.Point(16, 77);
this.btdoorf1.Name = "btdoorf1";
this.btdoorf1.Size = new System.Drawing.Size(100, 43);
this.btdoorf1.TabIndex = 5;
this.btdoorf1.Text = "DOOR-F1";
this.btdoorf1.UseVisualStyleBackColor = true;
this.btdoorf1.Click += new System.EventHandler(this.btSafetyCvIn_Click);
//
// btdoorf2
//
this.btdoorf2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.btdoorf2.Location = new System.Drawing.Point(118, 77);
this.btdoorf2.Name = "btdoorf2";
this.btdoorf2.Size = new System.Drawing.Size(100, 43);
this.btdoorf2.TabIndex = 8;
this.btdoorf2.Text = "DOOR-F2";
this.btdoorf2.UseVisualStyleBackColor = true;
this.btdoorf2.Click += new System.EventHandler(this.btSafetyCvOut_Click);
//
// tabPage1
//
this.tabPage1.Controls.Add(this.propertyGrid1);
@@ -571,16 +511,6 @@
this.tabPage1.Text = "Advanced Settings";
this.tabPage1.UseVisualStyleBackColor = true;
//
// bsLang
//
this.bsLang.DataMember = "language";
this.bsLang.DataSource = this.dataSet1;
//
// dataSet1
//
this.dataSet1.DataSetName = "DataSet1";
this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.btDefIO);
@@ -595,9 +525,9 @@
//
// btDefIO
//
this.btDefIO.Location = new System.Drawing.Point(23, 135);
this.btDefIO.Location = new System.Drawing.Point(13, 118);
this.btDefIO.Name = "btDefIO";
this.btDefIO.Size = new System.Drawing.Size(189, 43);
this.btDefIO.Size = new System.Drawing.Size(234, 43);
this.btDefIO.TabIndex = 48;
this.btDefIO.Text = "Define I/O Description";
this.btDefIO.UseVisualStyleBackColor = true;
@@ -605,9 +535,9 @@
//
// btDefError
//
this.btDefError.Location = new System.Drawing.Point(23, 75);
this.btDefError.Location = new System.Drawing.Point(13, 65);
this.btDefError.Name = "btDefError";
this.btDefError.Size = new System.Drawing.Size(189, 43);
this.btDefError.Size = new System.Drawing.Size(234, 43);
this.btDefError.TabIndex = 47;
this.btDefError.Text = "Define Error Messages";
this.btDefError.UseVisualStyleBackColor = true;
@@ -615,14 +545,24 @@
//
// btOpenZPL
//
this.btOpenZPL.Location = new System.Drawing.Point(23, 15);
this.btOpenZPL.Location = new System.Drawing.Point(13, 12);
this.btOpenZPL.Name = "btOpenZPL";
this.btOpenZPL.Size = new System.Drawing.Size(189, 43);
this.btOpenZPL.Size = new System.Drawing.Size(234, 43);
this.btOpenZPL.TabIndex = 46;
this.btOpenZPL.Text = "Open ZPL";
this.btOpenZPL.UseVisualStyleBackColor = true;
this.btOpenZPL.Click += new System.EventHandler(this.btOpenZPL_Click);
//
// bsLang
//
this.bsLang.DataMember = "language";
this.bsLang.DataSource = this.dataSet1;
//
// dataSet1
//
this.dataSet1.DataSetName = "DataSet1";
this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bsRecipient
//
this.bsRecipient.DataMember = "MailRecipient";
@@ -639,8 +579,7 @@
//
// fSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(614, 686);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel1);
@@ -660,9 +599,9 @@
this.groupBox1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsLang)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit();
this.tabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsRecipient)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bsMailForm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).EndInit();
@@ -682,15 +621,9 @@
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button btdoorr2;
private System.Windows.Forms.Button btdoorr1;
private System.Windows.Forms.Button btdoorf1;
private System.Windows.Forms.Button btBuz;
private System.Windows.Forms.Button btdoorf2;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btdoorf3;
private System.Windows.Forms.ErrorProvider errorProvider1;
private System.Windows.Forms.Button btdoorr3;
private System.Windows.Forms.Button btTWLamp;
private System.Windows.Forms.BindingSource bsRecipient;
private System.Windows.Forms.BindingSource bsMailForm;

View File

@@ -47,14 +47,6 @@ namespace Project
this.propertyGrid1.SelectedObject = this.dummySetting;
this.propertyGrid1.Refresh();
//Function usage
btdoorr1.BackColor = dummySetting.Disable_safty_R0 ? Color.Tomato : Color.Lime;
btdoorr2.BackColor = dummySetting.Disable_safty_R1 ? Color.Tomato : Color.Lime;
btdoorr3.BackColor = dummySetting.Disable_safty_R2 ? Color.Tomato : Color.Lime;
btdoorf1.BackColor = dummySetting.Disable_safty_F0 ? Color.Tomato : Color.Lime;
btdoorf2.BackColor = dummySetting.Disable_safty_F1 ? Color.Tomato : Color.Lime;
btdoorf3.BackColor = dummySetting.Disable_safty_F2 ? Color.Tomato : Color.Lime;
btBuz.BackColor = dummySetting.Disable_Buzzer == false ? Color.Lime : Color.Tomato;
this.btTWLamp.BackColor = dummySetting.Disable_TowerLamp ? Color.Tomato : Color.Lime;
this.btRoomLamp.BackColor = dummySetting.Disable_RoomLight == true ? Color.Tomato : Color.Lime;
@@ -213,54 +205,7 @@ namespace Project
but.BackColor = dummySetting.Disable_RoomLight == true ? Color.Tomato : Color.Lime;
}
private void button4_Click_1(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_SidQtyCheck = !dummySetting.Disable_SidQtyCheck;
but.BackColor = dummySetting.Disable_SidQtyCheck == true ? Color.Tomato : Color.Lime;
}
private void button2_Click_1(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_R0 = !dummySetting.Disable_safty_R0;
but.BackColor = dummySetting.Disable_safty_R0 ? Color.Tomato : Color.Lime;
}
private void button4_Click(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_R1 = !dummySetting.Disable_safty_R1;
but.BackColor = dummySetting.Disable_safty_R1 ? Color.Tomato : Color.Lime;
}
private void btSafetyP3_Click(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_R2 = !dummySetting.Disable_safty_R2;
but.BackColor = dummySetting.Disable_safty_R2 ? Color.Tomato : Color.Lime;
}
private void btSafetyCvIn_Click(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_F0 = !dummySetting.Disable_safty_F0;
but.BackColor = dummySetting.Disable_safty_F0 ? Color.Tomato : Color.Lime;
}
private void btSafetyCvOut_Click(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_F1 = !dummySetting.Disable_safty_F1;
but.BackColor = dummySetting.Disable_safty_F1 ? Color.Tomato : Color.Lime;
}
private void btLoaderDetect_Click(object sender, EventArgs e)
{
var but = sender as Button;
dummySetting.Disable_safty_F2 = !dummySetting.Disable_safty_F2;
but.BackColor = dummySetting.Disable_safty_F2 ? Color.Tomato : Color.Lime;
}
private void btLeftVac_Click(object sender, EventArgs e)
{
@@ -404,7 +349,7 @@ namespace Project
private void btOpenZPL_Click(object sender, EventArgs e)
{
var fi = new System.IO.FileInfo("zpl.txt");
var fi = new System.IO.FileInfo( UTIL.MakePath("data","zpl.txt"));
if (fi.Exists == false)
{
System.IO.File.WriteAllText(fi.FullName, Properties.Settings.Default.ZPL7, System.Text.Encoding.Default);

View File

@@ -1,73 +0,0 @@
using Microsoft.Owin.Cors;
using Owin;
using System.Web.Http.Routing;
using System.Web.Http;
using Microsoft.Owin.StaticFiles;
using Microsoft.Owin.FileSystems;
namespace Project.OWIN
{
public class Startup
{
public void Configuration(IAppBuilder appBuilder)
{
//var di = new System.IO.DirectoryInfo(@".\View");
//di = new System.IO.DirectoryInfo(@"D:\Source\WebDev\SVELT\svelte-start-app\public");
//if (di.Exists == false) di.Create();
//// Serve static files
//var options = new FileServerOptions
//{
// EnableDefaultFiles = true,
// FileSystem = new PhysicalFileSystem(di.FullName)
//};
//appBuilder.UseFileServer(options);
// Configure Web API for self-host
//HttpConfiguration config = new HttpConfiguration();
//config.Routes.MapHttpRoute(
// name: "DefaultApi",
// routeTemplate: "api/{controller}/{id}",
// defaults: new { id = RouteParameter.Optional }
//);
//config.Routes.MapHttpRoute(
// name: "ControlApi",
// routeTemplate: "api/{controller}/{action}/{id}",
// defaults: new { id = RouteParameter.Optional }
// );
// Configure Web API for Self-Host
HttpConfiguration config = new HttpConfiguration();
config.MapHttpAttributeRoutes();
////메인파일 처리 방법
IHttpRoute userrouter =
config.Routes.CreateRoute("ctrl/{controller}/{action}/{id}",
new { id = RouteParameter.Optional },
null);
//메인파일 처리 방법
IHttpRoute defaultRoute =
config.Routes.CreateRoute("api/{controller}/{id}",
new { id = RouteParameter.Optional },
null);
config.Routes.Add("defaultRoute", defaultRoute);
config.Routes.Add("userrouter", userrouter);
appBuilder.UseWebApi(config);
config.Formatters.JsonFormatter.SupportedMediaTypes.Add(
new System.Net.Http.Headers.MediaTypeHeaderValue("application/json")
);
// Remove the XML formatter
config.Formatters.Remove(config.Formatters.XmlFormatter);
appBuilder.UseCors(CorsOptions.AllowAll);
// appBuilder.UseWebApi(config);
}
}
}

View File

@@ -266,12 +266,6 @@ namespace Project
//둘중 하나라도 켜져있드면 비상 상태이다
var b1 = GetIOInput(eDIName.BUT_EMGF);
return b1;
//BitArray ba1 = new BitArray(8);
//ba1.Set(0, GetIOInput(eDIName.BUT_EMG1));
//ba1.Set(1, GetIOInput(eDIName.BUT_EMG2));
//ba1.Set(2, GetIOInput(eDIName.BUT_EMG3));
//ba1.Set(3, GetIOInput(eDIName.BUT_EMG4));
//return ba1.ValueI();
}
/// <summary>
@@ -391,22 +385,6 @@ namespace Project
{
if (SETTING.System.ReverseSIG_PortDetect2Up) curValue = !curValue;
}
//else if(pin == eDIName.L_CYLUP) //임시코드
//{
// curValue = !curValue;
//}
//else if(pin == eDIName.R_CYLUP) //임시코드
//{
// curValue = !curValue;
//}
//else if (pin == eDIName.L_EXT_READY)
//{
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
//}
//else if (pin == eDIName.R_EXT_READY)
//{
// if (SETTING.System.ReverseSIG_ExtConvReady) curValue = !curValue;
//}
else if (pin == eDIName.L_CONV1 || pin == eDIName.L_CONV4 || pin == eDIName.L_CONV3)
curValue = !curValue;
else if (pin == eDIName.R_CONV1 || pin == eDIName.R_CONV4 || pin == eDIName.R_CONV3)
@@ -425,30 +403,6 @@ namespace Project
return PUB.dio.GetDOValue(pindef.terminalno);
}
///// <summary>
///// A/D Link Digital input Pin number
///// </summary>
///// <param name="pin"></param>
///// <returns></returns>
//public static int GetDINum(eDIName pin)
//{
// return (int)pin + 1;
// //return COMM.SETTING.Data.DI[(byte)pin];
//}
///// <summary>
///// adlink digital output in number
///// </summary>
///// <param name="pin"></param>
///// <returns></returns>
//public static int Pin[eDOName pin)
//{
// return (int)pin + 1;
// //return COMM.SETTING.Data.DO[(byte)pin];
//}
/// <summary>
/// 포트내의 안전센서 여부
/// </summary>
@@ -478,17 +432,17 @@ namespace Project
{
if (idx == 0)
{
if (AR.SETTING.Data.Disable_safty_F0) return true;
if (SETTING.System.Disable_safty_F0) return true;
else return DIO.GetIOInput(eDIName.DOORF1) == false;
}
else if (idx == 1)
{
if (AR.SETTING.Data.Disable_safty_F1) return true;
if (AR.SETTING.System.Disable_safty_F1) return true;
else return DIO.GetIOInput(eDIName.DOORF2) == false;
}
else if (idx == 2)
{
if (AR.SETTING.Data.Disable_safty_F2) return true;
if (AR.SETTING.System.Disable_safty_F2) return true;
else return DIO.GetIOInput(eDIName.DOORF3) == false;
}
}
@@ -497,9 +451,9 @@ namespace Project
public static Boolean isSaftyDoorR(int idx, Boolean RealSensor)
{
if (RealSensor == false && idx == 0 && AR.SETTING.Data.Disable_safty_R0 == true) return true;
else if (RealSensor == false && idx == 1 && AR.SETTING.Data.Disable_safty_R1 == true) return true;
else if (RealSensor == false && idx == 2 && AR.SETTING.Data.Disable_safty_R2 == true) return true;
if (RealSensor == false && idx == 0 && AR.SETTING.System.Disable_safty_R0 == true) return true;
else if (RealSensor == false && idx == 1 && AR.SETTING.System.Disable_safty_R1 == true) return true;
else if (RealSensor == false && idx == 2 && AR.SETTING.System.Disable_safty_R2 == true) return true;
else if (idx == 0 && DIO.GetIOInput(eDIName.DOORR1) == false) return true;
else if (idx == 1 && DIO.GetIOInput(eDIName.DOORR2) == false) return true;
else if (idx == 2 && DIO.GetIOInput(eDIName.DOORR3) == false) return true;

View File

@@ -49,10 +49,6 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<applicationSettings>

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,6 @@
using AR;
using Chilkat;
using Emgu.CV;
using Emgu.CV.Structure;
using Microsoft.Owin.Hosting;
using Project.Dialog;
using System;
using System.Collections.Generic;
@@ -21,18 +19,6 @@ namespace Project
{
public partial class FMain : Form
{
[DllImport("user32")]
public static extern Boolean ShowWindow(IntPtr hWnd, Int32 nCmdShow);
[DllImport("user32.dll")]
private static extern int SetActiveWindow(int hwnd);
[DllImport("user32.dll")]
private static extern bool SetForegroundWindow(IntPtr hWnd);
[DllImport("user32.dll")]
private static extern bool ShowWindowAsync(IntPtr hWnd, int nCmdShow);
Boolean camliveBusy = false;
bool liveviewprocesson = false;
Stopwatch watFps = new Stopwatch();
@@ -223,15 +209,26 @@ namespace Project
}
void RefreshList()
//void RefreshList()
//{
// // 비동기로 실행
// Task.Run(async () => await RefreshListAsync());
//}
async Task RefreshList()
{
//if (COMM.SETTING.Data.OnlineMode == false) return;
if (this.InvokeRequired)
// ProgressBar 표시
this.BeginInvoke(new Action(() =>
{
this.BeginInvoke(new MethodInvoker(RefreshList));
return;
}
if (progressBarRefresh != null)
{
progressBarRefresh.Visible = true;
progressBarRefresh.Style = ProgressBarStyle.Marquee;
progressBarRefresh.MarqueeAnimationSpeed = 30;
}
}));
VAR.TIME[eVarTime.REFRESHLIST] = DateTime.Now;
@@ -243,56 +240,39 @@ namespace Project
{
try
{
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
ta.FillByLen7(this.dataSet1.K4EE_Component_Reel_Result, dtstr, dtstr, AR.SETTING.Data.McName);
await Task.Run(() =>
{
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
ta.FillByLen7(this.dataSet1.K4EE_Component_Reel_Result, dtstr, dtstr, AR.SETTING.Data.McName);
});
}
catch (Exception ex)
{
PUB.log.AddE($"DB History Request Error" + ex.Message);
}
}
ListFormmatData();
// UI 업데이트는 UI 스레드에서
this.BeginInvoke(new Action(() => ListFormmatData()));
var TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST);
PUB.log.AddI(string.Format($"List refresh({0} items) {TS1.TotalSeconds:N1}s", dataSet1.K4EE_Component_Reel_Result.Count));
////Summary
//listView1.Items.Clear();
//using (var ta = new DataSet1TableAdapters.ResultSummaryTableAdapter())
//{
// var dt = ta.GetData(dtstr, dtstr, AR.SETTING.Data.McName);
// var sum_qty = 0;
// var sum_kpc = 0.0;
// foreach (DataSet1.ResultSummaryRow dr in dt)
// {
// var lv = this.listView1.Items.Add(dr.PARTNO);
// lv.SubItems.Add(dr.VLOT);
// lv.SubItems.Add($"{dr.QTY}");
// lv.SubItems.Add($"{dr.KPC}");
// sum_qty += dr.QTY;
// sum_kpc += dr.KPC;
// }
// if (sum_qty > 0)
// {
// var lvsum = this.listView1.Items.Add("TOTAL");
// lvsum.SubItems.Add("");
// lvsum.SubItems.Add($"{sum_qty}");
// lvsum.SubItems.Add($"{sum_kpc}");
// lvsum.BackColor = Color.LightGray;
// }
//}
//TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST);
//PUB.log.AddI($"Summary{TS1.TotalSeconds:N1}s");
}
catch (Exception ex)
{
PUB.log.AddE("List refresh failed:" + ex.Message);
}
finally
{
// ProgressBar 숨기기
this.BeginInvoke(new Action(() =>
{
if (progressBarRefresh != null)
{
progressBarRefresh.Visible = false;
}
}));
}
}
void ListFormmatData()
@@ -334,7 +314,7 @@ namespace Project
}
arDatagridView1.ResumeLayout();
}
private void __Load(object sender, EventArgs e)
async private void __Load(object sender, EventArgs e)
{
@@ -355,6 +335,7 @@ namespace Project
//this.pPosR.Visible = false;
this.Show();
Application.DoEvents();
// sbDevice.Text = "";
SetStatusMessage("Program initialization", Color.White, Color.White, Color.Tomato, Color.Black);
@@ -446,29 +427,8 @@ namespace Project
PUB.plc.ValueChanged += Plc_ValueChanged;
PUB.plc.Start();
//Connection check thread
var thStart = new System.Threading.ThreadStart(bwDeviceConnection);
thConnection = new System.Threading.Thread(thStart);
thConnection.IsBackground = true;
thConnection.Start();
VAR.I32[eVarInt32.Front_Laser_Cleaning] += 1;
//Joystick configuration
PUB.joystick = new arDev.Joystick.JoystickRaw();
PUB.joystick.Changed += Joystick_Changed;
PUB.joystick.Connected += Joystick_Connected;
PUB.joystick.Disconnected += Joystick_Disconnected;
PUB.joystick.InputChanged += Joystick_InputChanged;
if (AR.SETTING.Data.Jostick_pid != 0 && AR.SETTING.Data.Jostick_vid != 0)
{
PUB.log.Add($"Joystick Connect VID:{AR.SETTING.Data.Jostick_vid},PID:{AR.SETTING.Data.Jostick_pid}");
PUB.joystick.Connect(AR.SETTING.Data.Jostick_vid, AR.SETTING.Data.Jostick_pid);
}
//Keyence connection
if (SETTING.Data.Keyence_IPF.isEmpty() == false)
{
@@ -510,15 +470,17 @@ namespace Project
UTIL.RunProcess(swplcfile);
}
RefreshList();
await RefreshList();
UpdateControl();
PUB.flag.set(eVarBool.FG_ENABLE_LEFT, !AR.SETTING.Data.Disable_Left, "LOAD");
PUB.flag.set(eVarBool.FG_ENABLE_RIGHT, !AR.SETTING.Data.Disable_Right, "LOAD");
this.Show();
this.Activate();
//Connection check thread
var thStart = new System.Threading.ThreadStart(bwDeviceConnection);
thConnection = new System.Threading.Thread(thStart);
thConnection.IsBackground = true;
thConnection.Start();
}
@@ -1646,9 +1608,9 @@ namespace Project
f.ShowDialog();
}
private void refreshToolStripMenuItem_Click_1(object sender, EventArgs e)
async private void refreshToolStripMenuItem_Click_1(object sender, EventArgs e)
{
RefreshList();
await RefreshList();
}
private void systemParameterMotorToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1701,7 +1663,7 @@ namespace Project
f.Show();
}
private void managementToolStripMenuItem_Click_1(object sender, EventArgs e)
async private void managementToolStripMenuItem_Click_1(object sender, EventArgs e)
{
if (PUB.sm.isRunning)
{
@@ -1724,7 +1686,7 @@ namespace Project
btMReset.PerformClick();
}
RefreshList();
await RefreshList();
}
}
@@ -1818,52 +1780,9 @@ namespace Project
var motionmode = VAR.BOOL[eVarBool.Use_Conveyor] ? "Conveyor" : "Default";
PUB.SelectModelM(motionmode);
UpdateControl();
if (VAR.BOOL[eVarBool.Use_Conveyor])
{
//var dlg = UTIL.MsgQ("Do you want to change the model for other equipment as well?");
//if (dlg == DialogResult.Yes)
//{
// List<String> urls = new List<string>();
// var conv = VAR.BOOL[eVarBool.Use_Conveyor] ? "1" : "0";
// if (SETTING.Data.McName == "R1")
// {
// urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}");
// urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}");
// }
// else if (SETTING.Data.McName == "R2")
// {
// urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}");
// urls.Add($"{SETTING.Data.WebAPI_R3}/ctrl/model/Set/{f.Value}|{conv}");
// }
// else if (SETTING.Data.McName == "R3")
// {
// urls.Add($"{SETTING.Data.WebAPI_R1}/ctrl/model/Set/{f.Value}|{conv}");
// urls.Add($"{SETTING.Data.WebAPI_R2}/ctrl/model/Set/{f.Value}|{conv}");
// }
// await System.Threading.Tasks.Task.Run(() =>
// {
// if (urls.Any())
// {
// foreach (var url in urls)
// {
// PUB.log.AddI($"Automatic model setting: {url}");
// var rlt = UTIL.GetStrfromurl(url, out bool iserr, 3000);
// if (iserr)
// {
// PUB.log.Add($"Model setting failed: " + rlt);
// }
// }
// }
// });
//}
}
}
}
}
private void displayVARToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1873,16 +1792,6 @@ namespace Project
f.Show();
}
private void SIDInfoToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void listView21_Click(object sender, EventArgs e)
{
}
private void lbMsg_Click(object sender, EventArgs e)
{
//reset function
@@ -1891,25 +1800,6 @@ namespace Project
}
private void PrintRuleToolStripMenuItem_Click(object sender, EventArgs e)
{
using (var f = new Dialog.RegExPrintRule())
f.ShowDialog();
}
private void tRIGONToolStripMenuItem_Click(object sender, EventArgs e)
{
PUB.keyenceF.Trigger(true);
PUB.keyenceR.Trigger(true);
}
private void tRIGOFFToolStripMenuItem_Click(object sender, EventArgs e)
{
PUB.keyenceF.Trigger(false);
PUB.keyenceR.Trigger(false);
}
private void toolStripMenuItem17_Click(object sender, EventArgs e)
{
@@ -2150,9 +2040,9 @@ namespace Project
var rlt = await PUB.UpdateSIDInfo();
if (rlt.Item1 == false)
{
PUB.log.AddE($"Inbound data update failed: " + rlt.Item2);
PUB.log.AddE($"SID Information update failed: " + rlt.Item2);
}
else PUB.log.AddI($"Inbound data update successful");
else PUB.log.AddI($"SID Information update successful");
}
private void hmi1_ZoneItemClick(object sender, HMI.ZoneItemClickEventargs e)

File diff suppressed because it is too large Load Diff

View File

@@ -9,16 +9,8 @@
<package id="Microsoft.AspNet.WebApi" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.Owin" version="4.2.2" targetFramework="net48" />
<package id="Microsoft.Owin.Cors" version="4.2.2" targetFramework="net48" />
<package id="Microsoft.Owin.FileSystems" version="4.2.2" targetFramework="net48" />
<package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net48" />
<package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net48" />
<package id="Microsoft.Owin.StaticFiles" version="4.2.2" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="Owin" version="1.0" targetFramework="net48" />
<package id="System.Drawing.Common" version="7.0.0" targetFramework="net48" />
<package id="System.Drawing.Primitives" version="4.3.0" targetFramework="net47" />
<package id="System.Runtime" version="4.3.1" targetFramework="net47" />

File diff suppressed because it is too large Load Diff

View File

@@ -7,12 +7,12 @@
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="cs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="cs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ResultView.Properties.Settings.GlobalReference.Default.cs" Provider="System.Data.SqlClient" />
</Connections>
<Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Component_Reel_ResultTableAdapter" GeneratorDataComponentClassName="Component_Reel_ResultTableAdapter" Name="Component_Reel_Result" UserDataComponentName="Component_Reel_ResultTableAdapter">
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="K4EE_Component_Reel_ResultTableAdapter" GeneratorDataComponentClassName="K4EE_Component_Reel_ResultTableAdapter" Name="K4EE_Component_Reel_Result" UserDataComponentName="K4EE_Component_Reel_ResultTableAdapter">
<MainSource>
<DbSource ConnectionRef="cs (Settings)" DbObjectName="EE.dbo.Component_Reel_Result" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DbSource ConnectionRef="cs (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_Result" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Component_Reel_Result] WHERE (([idx] = @Original_idx) AND ([STIME] = @Original_STIME) AND ((@IsNull_ETIME = 1 AND [ETIME] IS NULL) OR ([ETIME] = @Original_ETIME)) AND ((@IsNull_PDATE = 1 AND [PDATE] IS NULL) OR ([PDATE] = @Original_PDATE)) AND ((@IsNull_JTYPE = 1 AND [JTYPE] IS NULL) OR ([JTYPE] = @Original_JTYPE)) AND ((@IsNull_JGUID = 1 AND [JGUID] IS NULL) OR ([JGUID] = @Original_JGUID)) AND ((@IsNull_SID = 1 AND [SID] IS NULL) OR ([SID] = @Original_SID)) AND ((@IsNull_SID0 = 1 AND [SID0] IS NULL) OR ([SID0] = @Original_SID0)) AND ((@IsNull_RID = 1 AND [RID] IS NULL) OR ([RID] = @Original_RID)) AND ((@IsNull_RID0 = 1 AND [RID0] IS NULL) OR ([RID0] = @Original_RID0)) AND ((@IsNull_RSN = 1 AND [RSN] IS NULL) OR ([RSN] = @Original_RSN)) AND ((@IsNull_QR = 1 AND [QR] IS NULL) OR ([QR] = @Original_QR)) AND ((@IsNull_ZPL = 1 AND [ZPL] IS NULL) OR ([ZPL] = @Original_ZPL)) AND ((@IsNull_POS = 1 AND [POS] IS NULL) OR ([POS] = @Original_POS)) AND ((@IsNull_LOC = 1 AND [LOC] IS NULL) OR ([LOC] = @Original_LOC)) AND ((@IsNull_ANGLE = 1 AND [ANGLE] IS NULL) OR ([ANGLE] = @Original_ANGLE)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_QTY0 = 1 AND [QTY0] IS NULL) OR ([QTY0] = @Original_QTY0)) AND ((@IsNull_VNAME = 1 AND [VNAME] IS NULL) OR ([VNAME] = @Original_VNAME)) AND ((@IsNull_PRNATTACH = 1 AND [PRNATTACH] IS NULL) OR ([PRNATTACH] = @Original_PRNATTACH)) AND ((@IsNull_PRNVALID = 1 AND [PRNVALID] IS NULL) OR ([PRNVALID] = @Original_PRNVALID)) AND ([wdate] = @Original_wdate) AND ((@IsNull_VLOT = 1 AND [VLOT] IS NULL) OR ([VLOT] = @Original_VLOT)) AND ((@IsNull_BATCH = 1 AND [BATCH] IS NULL) OR ([BATCH] = @Original_BATCH)) AND ((@IsNull_qtymax = 1 AND [qtymax] IS NULL) OR ([qtymax] = @Original_qtymax)))</CommandText>
<CommandText>DELETE FROM [K4EE_Component_Reel_Result] WHERE (([idx] = @Original_idx) AND ([STIME] = @Original_STIME) AND ((@IsNull_ETIME = 1 AND [ETIME] IS NULL) OR ([ETIME] = @Original_ETIME)) AND ((@IsNull_PDATE = 1 AND [PDATE] IS NULL) OR ([PDATE] = @Original_PDATE)) AND ((@IsNull_JTYPE = 1 AND [JTYPE] IS NULL) OR ([JTYPE] = @Original_JTYPE)) AND ((@IsNull_JGUID = 1 AND [JGUID] IS NULL) OR ([JGUID] = @Original_JGUID)) AND ((@IsNull_SID = 1 AND [SID] IS NULL) OR ([SID] = @Original_SID)) AND ((@IsNull_SID0 = 1 AND [SID0] IS NULL) OR ([SID0] = @Original_SID0)) AND ((@IsNull_RID = 1 AND [RID] IS NULL) OR ([RID] = @Original_RID)) AND ((@IsNull_RID0 = 1 AND [RID0] IS NULL) OR ([RID0] = @Original_RID0)) AND ((@IsNull_RSN = 1 AND [RSN] IS NULL) OR ([RSN] = @Original_RSN)) AND ((@IsNull_QR = 1 AND [QR] IS NULL) OR ([QR] = @Original_QR)) AND ((@IsNull_ZPL = 1 AND [ZPL] IS NULL) OR ([ZPL] = @Original_ZPL)) AND ((@IsNull_POS = 1 AND [POS] IS NULL) OR ([POS] = @Original_POS)) AND ((@IsNull_LOC = 1 AND [LOC] IS NULL) OR ([LOC] = @Original_LOC)) AND ((@IsNull_ANGLE = 1 AND [ANGLE] IS NULL) OR ([ANGLE] = @Original_ANGLE)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_QTY0 = 1 AND [QTY0] IS NULL) OR ([QTY0] = @Original_QTY0)) AND ((@IsNull_VNAME = 1 AND [VNAME] IS NULL) OR ([VNAME] = @Original_VNAME)) AND ((@IsNull_PRNATTACH = 1 AND [PRNATTACH] IS NULL) OR ([PRNATTACH] = @Original_PRNATTACH)) AND ((@IsNull_PRNVALID = 1 AND [PRNVALID] IS NULL) OR ([PRNVALID] = @Original_PRNVALID)) AND ([wdate] = @Original_wdate) AND ((@IsNull_VLOT = 1 AND [VLOT] IS NULL) OR ([VLOT] = @Original_VLOT)) AND ((@IsNull_BATCH = 1 AND [BATCH] IS NULL) OR ([BATCH] = @Original_BATCH)) AND ((@IsNull_qtymax = 1 AND [qtymax] IS NULL) OR ([qtymax] = @Original_qtymax)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_STIME" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="STIME" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -65,45 +65,45 @@
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [Component_Reel_Result] ([STIME], [ETIME], [PDATE], [JTYPE], [JGUID], [SID], [SID0], [RID], [RID0], [RSN], [QR], [ZPL], [POS], [LOC], [ANGLE], [QTY], [QTY0], [VNAME], [PRNATTACH], [PRNVALID], [wdate], [VLOT], [BATCH], [qtymax]) VALUES (@STIME, @ETIME, @PDATE, @JTYPE, @JGUID, @SID, @SID0, @RID, @RID0, @RSN, @QR, @ZPL, @POS, @LOC, @ANGLE, @QTY, @QTY0, @VNAME, @PRNATTACH, @PRNVALID, @wdate, @VLOT, @BATCH, @qtymax);
SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZPL, POS, LOC, ANGLE, QTY, QTY0, VNAME, PRNATTACH, PRNVALID, wdate, VLOT, BATCH, qtymax FROM Component_Reel_Result WHERE (idx = SCOPE_IDENTITY()) ORDER BY wdate DESC</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO [K4EE_Component_Reel_Result] ([STIME], [ETIME], [PDATE], [JTYPE], [JGUID], [SID], [SID0], [RID], [RID0], [RSN], [QR], [ZPL], [POS], [LOC], [ANGLE], [QTY], [QTY0], [VNAME], [PRNATTACH], [PRNVALID], [wdate], [VLOT], [BATCH], [qtymax]) VALUES (@STIME, @ETIME, @PDATE, @JTYPE, @JGUID, @SID, @SID0, @RID, @RID0, @RSN, @QR, @ZPL, @POS, @LOC, @ANGLE, @QTY, @QTY0, @VNAME, @PRNATTACH, @PRNVALID, @wdate, @VLOT, @BATCH, @qtymax);
SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZPL, POS, LOC, ANGLE, QTY, QTY0, VNAME, PRNATTACH, PRNVALID, wdate, VLOT, BATCH, qtymax FROM K4EE_Component_Reel_Result WHERE (idx = SCOPE_IDENTITY()) ORDER BY wdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@STIME" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="STIME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ETIME" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ETIME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PDATE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PDATE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@JTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="JTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@JGUID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="JGUID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SID0" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@RID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="RID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@RID0" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="RID0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@RSN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="RSN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@QR" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="QR" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ZPL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ZPL" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@POS" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="POS" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LOC" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ANGLE" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ANGLE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@QTY" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="QTY" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@QTY0" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="QTY0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@PRNATTACH" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="PRNATTACH" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@PRNVALID" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="PRNVALID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VLOT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VLOT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@BATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="BATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@qtymax" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="qtymax" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="STIME" ColumnName="STIME" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@STIME" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="STIME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ETIME" ColumnName="ETIME" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ETIME" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ETIME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="PDATE" ColumnName="PDATE" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@PDATE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="PDATE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="JTYPE" ColumnName="JTYPE" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@JTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="JTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="JGUID" ColumnName="JGUID" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@JGUID" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="JGUID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SID" ColumnName="SID" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@SID" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SID0" ColumnName="SID0" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@SID0" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SID0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="RID" ColumnName="RID" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@RID" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="RID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="RID0" ColumnName="RID0" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@RID0" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="RID0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="RSN" ColumnName="RSN" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@RSN" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="RSN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="QR" ColumnName="QR" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@QR" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="QR" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ZPL" ColumnName="ZPL" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@ZPL" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="ZPL" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="POS" ColumnName="POS" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@POS" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="POS" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="LOC" ColumnName="LOC" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(1)" DbType="AnsiString" Direction="Input" ParameterName="@LOC" Precision="0" ProviderType="VarChar" Scale="0" Size="1" SourceColumn="LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ANGLE" ColumnName="ANGLE" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ANGLE" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ANGLE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="QTY" ColumnName="QTY" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@QTY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="QTY" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="QTY0" ColumnName="QTY0" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@QTY0" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="QTY0" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="VNAME" ColumnName="VNAME" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@VNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="VNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="PRNATTACH" ColumnName="PRNATTACH" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@PRNATTACH" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="PRNATTACH" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="PRNVALID" ColumnName="PRNVALID" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@PRNVALID" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="PRNVALID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="VLOT" ColumnName="VLOT" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@VLOT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="VLOT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="BATCH" ColumnName="BATCH" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@BATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="BATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="qtymax" ColumnName="qtymax" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@qtymax" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="qtymax" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZPL, POS, LOC, ANGLE, QTY, QTY0, VNAME, PRNATTACH, PRNVALID, wdate, VLOT, BATCH, qtymax
FROM Component_Reel_Result
FROM K4EE_Component_Reel_Result WITH (nolock)
WHERE (MC = @mc) AND (CONVERT(varchar(10), wdate, 120) BETWEEN @sd AND @ed) AND (ISNULL(QR, '') LIKE @search)
ORDER BY wdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="mc" ColumnName="MC" DataSourceName="EE.dbo.Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@mc" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="MC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="mc" ColumnName="MC" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@mc" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="MC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="sd" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ed" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -112,8 +112,8 @@ ORDER BY wdate DESC</CommandText>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Component_Reel_Result] SET [STIME] = @STIME, [ETIME] = @ETIME, [PDATE] = @PDATE, [JTYPE] = @JTYPE, [JGUID] = @JGUID, [SID] = @SID, [SID0] = @SID0, [RID] = @RID, [RID0] = @RID0, [RSN] = @RSN, [QR] = @QR, [ZPL] = @ZPL, [POS] = @POS, [LOC] = @LOC, [ANGLE] = @ANGLE, [QTY] = @QTY, [QTY0] = @QTY0, [VNAME] = @VNAME, [PRNATTACH] = @PRNATTACH, [PRNVALID] = @PRNVALID, [wdate] = @wdate, [VLOT] = @VLOT, [BATCH] = @BATCH, [qtymax] = @qtymax WHERE (([idx] = @Original_idx) AND ([STIME] = @Original_STIME) AND ((@IsNull_ETIME = 1 AND [ETIME] IS NULL) OR ([ETIME] = @Original_ETIME)) AND ((@IsNull_PDATE = 1 AND [PDATE] IS NULL) OR ([PDATE] = @Original_PDATE)) AND ((@IsNull_JTYPE = 1 AND [JTYPE] IS NULL) OR ([JTYPE] = @Original_JTYPE)) AND ((@IsNull_JGUID = 1 AND [JGUID] IS NULL) OR ([JGUID] = @Original_JGUID)) AND ((@IsNull_SID = 1 AND [SID] IS NULL) OR ([SID] = @Original_SID)) AND ((@IsNull_SID0 = 1 AND [SID0] IS NULL) OR ([SID0] = @Original_SID0)) AND ((@IsNull_RID = 1 AND [RID] IS NULL) OR ([RID] = @Original_RID)) AND ((@IsNull_RID0 = 1 AND [RID0] IS NULL) OR ([RID0] = @Original_RID0)) AND ((@IsNull_RSN = 1 AND [RSN] IS NULL) OR ([RSN] = @Original_RSN)) AND ((@IsNull_QR = 1 AND [QR] IS NULL) OR ([QR] = @Original_QR)) AND ((@IsNull_ZPL = 1 AND [ZPL] IS NULL) OR ([ZPL] = @Original_ZPL)) AND ((@IsNull_POS = 1 AND [POS] IS NULL) OR ([POS] = @Original_POS)) AND ((@IsNull_LOC = 1 AND [LOC] IS NULL) OR ([LOC] = @Original_LOC)) AND ((@IsNull_ANGLE = 1 AND [ANGLE] IS NULL) OR ([ANGLE] = @Original_ANGLE)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_QTY0 = 1 AND [QTY0] IS NULL) OR ([QTY0] = @Original_QTY0)) AND ((@IsNull_VNAME = 1 AND [VNAME] IS NULL) OR ([VNAME] = @Original_VNAME)) AND ((@IsNull_PRNATTACH = 1 AND [PRNATTACH] IS NULL) OR ([PRNATTACH] = @Original_PRNATTACH)) AND ((@IsNull_PRNVALID = 1 AND [PRNVALID] IS NULL) OR ([PRNVALID] = @Original_PRNVALID)) AND ([wdate] = @Original_wdate) AND ((@IsNull_VLOT = 1 AND [VLOT] IS NULL) OR ([VLOT] = @Original_VLOT)) AND ((@IsNull_BATCH = 1 AND [BATCH] IS NULL) OR ([BATCH] = @Original_BATCH)) AND ((@IsNull_qtymax = 1 AND [qtymax] IS NULL) OR ([qtymax] = @Original_qtymax)));
SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZPL, POS, LOC, ANGLE, QTY, QTY0, VNAME, PRNATTACH, PRNVALID, wdate, VLOT, BATCH, qtymax FROM Component_Reel_Result WHERE (idx = @idx) ORDER BY wdate DESC</CommandText>
<CommandText>UPDATE [K4EE_Component_Reel_Result] SET [STIME] = @STIME, [ETIME] = @ETIME, [PDATE] = @PDATE, [JTYPE] = @JTYPE, [JGUID] = @JGUID, [SID] = @SID, [SID0] = @SID0, [RID] = @RID, [RID0] = @RID0, [RSN] = @RSN, [QR] = @QR, [ZPL] = @ZPL, [POS] = @POS, [LOC] = @LOC, [ANGLE] = @ANGLE, [QTY] = @QTY, [QTY0] = @QTY0, [VNAME] = @VNAME, [PRNATTACH] = @PRNATTACH, [PRNVALID] = @PRNVALID, [wdate] = @wdate, [VLOT] = @VLOT, [BATCH] = @BATCH, [qtymax] = @qtymax WHERE (([idx] = @Original_idx) AND ([STIME] = @Original_STIME) AND ((@IsNull_ETIME = 1 AND [ETIME] IS NULL) OR ([ETIME] = @Original_ETIME)) AND ((@IsNull_PDATE = 1 AND [PDATE] IS NULL) OR ([PDATE] = @Original_PDATE)) AND ((@IsNull_JTYPE = 1 AND [JTYPE] IS NULL) OR ([JTYPE] = @Original_JTYPE)) AND ((@IsNull_JGUID = 1 AND [JGUID] IS NULL) OR ([JGUID] = @Original_JGUID)) AND ((@IsNull_SID = 1 AND [SID] IS NULL) OR ([SID] = @Original_SID)) AND ((@IsNull_SID0 = 1 AND [SID0] IS NULL) OR ([SID0] = @Original_SID0)) AND ((@IsNull_RID = 1 AND [RID] IS NULL) OR ([RID] = @Original_RID)) AND ((@IsNull_RID0 = 1 AND [RID0] IS NULL) OR ([RID0] = @Original_RID0)) AND ((@IsNull_RSN = 1 AND [RSN] IS NULL) OR ([RSN] = @Original_RSN)) AND ((@IsNull_QR = 1 AND [QR] IS NULL) OR ([QR] = @Original_QR)) AND ((@IsNull_ZPL = 1 AND [ZPL] IS NULL) OR ([ZPL] = @Original_ZPL)) AND ((@IsNull_POS = 1 AND [POS] IS NULL) OR ([POS] = @Original_POS)) AND ((@IsNull_LOC = 1 AND [LOC] IS NULL) OR ([LOC] = @Original_LOC)) AND ((@IsNull_ANGLE = 1 AND [ANGLE] IS NULL) OR ([ANGLE] = @Original_ANGLE)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_QTY0 = 1 AND [QTY0] IS NULL) OR ([QTY0] = @Original_QTY0)) AND ((@IsNull_VNAME = 1 AND [VNAME] IS NULL) OR ([VNAME] = @Original_VNAME)) AND ((@IsNull_PRNATTACH = 1 AND [PRNATTACH] IS NULL) OR ([PRNATTACH] = @Original_PRNATTACH)) AND ((@IsNull_PRNVALID = 1 AND [PRNVALID] IS NULL) OR ([PRNVALID] = @Original_PRNVALID)) AND ([wdate] = @Original_wdate) AND ((@IsNull_VLOT = 1 AND [VLOT] IS NULL) OR ([VLOT] = @Original_VLOT)) AND ((@IsNull_BATCH = 1 AND [BATCH] IS NULL) OR ([BATCH] = @Original_BATCH)) AND ((@IsNull_qtymax = 1 AND [qtymax] IS NULL) OR ([qtymax] = @Original_qtymax)));
SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZPL, POS, LOC, ANGLE, QTY, QTY0, VNAME, PRNATTACH, PRNVALID, wdate, VLOT, BATCH, qtymax FROM K4EE_Component_Reel_Result WITH (nolock) WHERE (idx = @idx) ORDER BY wdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@STIME" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="STIME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ETIME" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ETIME" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -186,7 +186,7 @@ SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZP
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_BATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="BATCH" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_qtymax" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="qtymax" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_qtymax" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="qtymax" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Component_Reel_Result" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="WMS.dbo.K4EE_Component_Reel_Result" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</UpdateCommand>
@@ -218,6 +218,7 @@ SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZP
<Mapping SourceColumn="VLOT" DataSetColumn="VLOT" />
<Mapping SourceColumn="BATCH" DataSetColumn="BATCH" />
<Mapping SourceColumn="-1" DataSetColumn="qtymax" />
<Mapping SourceColumn="qtymax" DataSetColumn="qtymax" />
</Mappings>
<Sources />
</TableAdapter>
@@ -226,134 +227,134 @@ SELECT idx, STIME, ETIME, PDATE, JTYPE, JGUID, SID, SID0, RID, RID0, RSN, QR, ZP
</DataSource>
</xs:appinfo>
</xs:annotation>
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="DataSet1" msprop:Generator_DataSetName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Component_Reel_Result" msprop:Generator_TableClassName="Component_Reel_ResultDataTable" msprop:Generator_TableVarName="tableComponent_Reel_Result" msprop:Generator_RowChangedName="Component_Reel_ResultRowChanged" msprop:Generator_TablePropName="Component_Reel_Result" msprop:Generator_RowDeletingName="Component_Reel_ResultRowDeleting" msprop:Generator_RowChangingName="Component_Reel_ResultRowChanging" msprop:Generator_RowEvHandlerName="Component_Reel_ResultRowChangeEventHandler" msprop:Generator_RowDeletedName="Component_Reel_ResultRowDeleted" msprop:Generator_RowClassName="Component_Reel_ResultRow" msprop:Generator_UserTableName="Component_Reel_Result" msprop:Generator_RowEvArgName="Component_Reel_ResultRowChangeEvent">
<xs:element name="K4EE_Component_Reel_Result" msprop:Generator_RowEvHandlerName="K4EE_Component_Reel_ResultRowChangeEventHandler" msprop:Generator_RowDeletedName="K4EE_Component_Reel_ResultRowDeleted" msprop:Generator_RowDeletingName="K4EE_Component_Reel_ResultRowDeleting" msprop:Generator_RowEvArgName="K4EE_Component_Reel_ResultRowChangeEvent" msprop:Generator_TablePropName="K4EE_Component_Reel_Result" msprop:Generator_RowChangedName="K4EE_Component_Reel_ResultRowChanged" msprop:Generator_RowChangingName="K4EE_Component_Reel_ResultRowChanging" msprop:Generator_TableClassName="K4EE_Component_Reel_ResultDataTable" msprop:Generator_RowClassName="K4EE_Component_Reel_ResultRow" msprop:Generator_TableVarName="tableK4EE_Component_Reel_Result" msprop:Generator_UserTableName="K4EE_Component_Reel_Result">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="STIME" msprop:Generator_ColumnVarNameInTable="columnSTIME" msprop:Generator_ColumnPropNameInRow="STIME" msprop:Generator_ColumnPropNameInTable="STIMEColumn" msprop:Generator_UserColumnName="STIME" type="xs:dateTime" />
<xs:element name="ETIME" msprop:Generator_ColumnVarNameInTable="columnETIME" msprop:Generator_ColumnPropNameInRow="ETIME" msprop:Generator_ColumnPropNameInTable="ETIMEColumn" msprop:Generator_UserColumnName="ETIME" type="xs:dateTime" minOccurs="0" />
<xs:element name="PDATE" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PDATE" msprop:Generator_ColumnVarNameInTable="columnPDATE" msprop:Generator_ColumnPropNameInTable="PDATEColumn" msprop:Generator_UserColumnName="PDATE" minOccurs="0">
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="STIME" msprop:Generator_ColumnPropNameInRow="STIME" msprop:Generator_ColumnPropNameInTable="STIMEColumn" msprop:Generator_ColumnVarNameInTable="columnSTIME" msprop:Generator_UserColumnName="STIME" type="xs:dateTime" />
<xs:element name="ETIME" msprop:Generator_ColumnPropNameInRow="ETIME" msprop:Generator_ColumnPropNameInTable="ETIMEColumn" msprop:Generator_ColumnVarNameInTable="columnETIME" msprop:Generator_UserColumnName="ETIME" type="xs:dateTime" minOccurs="0" />
<xs:element name="PDATE" msprop:Generator_ColumnPropNameInTable="PDATEColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PDATE" msprop:Generator_UserColumnName="PDATE" msprop:Generator_ColumnVarNameInTable="columnPDATE" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="JTYPE" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="JTYPE" msprop:Generator_ColumnVarNameInTable="columnJTYPE" msprop:Generator_ColumnPropNameInTable="JTYPEColumn" msprop:Generator_UserColumnName="JTYPE" minOccurs="0">
<xs:element name="JTYPE" msprop:Generator_ColumnPropNameInTable="JTYPEColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="JTYPE" msprop:Generator_UserColumnName="JTYPE" msprop:Generator_ColumnVarNameInTable="columnJTYPE" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="JGUID" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="JGUID" msprop:Generator_ColumnVarNameInTable="columnJGUID" msprop:Generator_ColumnPropNameInTable="JGUIDColumn" msprop:Generator_UserColumnName="JGUID" minOccurs="0">
<xs:element name="JGUID" msprop:Generator_ColumnPropNameInTable="JGUIDColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="JGUID" msprop:Generator_UserColumnName="JGUID" msprop:Generator_ColumnVarNameInTable="columnJGUID" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="SID" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SID" msprop:Generator_ColumnVarNameInTable="columnSID" msprop:Generator_ColumnPropNameInTable="SIDColumn" msprop:Generator_UserColumnName="SID" minOccurs="0">
<xs:element name="SID" msprop:Generator_ColumnPropNameInTable="SIDColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SID" msprop:Generator_UserColumnName="SID" msprop:Generator_ColumnVarNameInTable="columnSID" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="SID0" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SID0" msprop:Generator_ColumnVarNameInTable="columnSID0" msprop:Generator_ColumnPropNameInTable="SID0Column" msprop:Generator_UserColumnName="SID0" minOccurs="0">
<xs:element name="SID0" msprop:Generator_ColumnPropNameInTable="SID0Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SID0" msprop:Generator_UserColumnName="SID0" msprop:Generator_ColumnVarNameInTable="columnSID0" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="RID" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RID" msprop:Generator_ColumnVarNameInTable="columnRID" msprop:Generator_ColumnPropNameInTable="RIDColumn" msprop:Generator_UserColumnName="RID" minOccurs="0">
<xs:element name="RID" msprop:Generator_ColumnPropNameInTable="RIDColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RID" msprop:Generator_UserColumnName="RID" msprop:Generator_ColumnVarNameInTable="columnRID" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="RID0" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RID0" msprop:Generator_ColumnVarNameInTable="columnRID0" msprop:Generator_ColumnPropNameInTable="RID0Column" msprop:Generator_UserColumnName="RID0" minOccurs="0">
<xs:element name="RID0" msprop:Generator_ColumnPropNameInTable="RID0Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RID0" msprop:Generator_UserColumnName="RID0" msprop:Generator_ColumnVarNameInTable="columnRID0" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="RSN" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RSN" msprop:Generator_ColumnVarNameInTable="columnRSN" msprop:Generator_ColumnPropNameInTable="RSNColumn" msprop:Generator_UserColumnName="RSN" minOccurs="0">
<xs:element name="RSN" msprop:Generator_ColumnPropNameInTable="RSNColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="RSN" msprop:Generator_UserColumnName="RSN" msprop:Generator_ColumnVarNameInTable="columnRSN" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="QR" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="QR" msprop:Generator_ColumnVarNameInTable="columnQR" msprop:Generator_ColumnPropNameInTable="QRColumn" msprop:Generator_UserColumnName="QR" minOccurs="0">
<xs:element name="QR" msprop:Generator_ColumnPropNameInTable="QRColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="QR" msprop:Generator_UserColumnName="QR" msprop:Generator_ColumnVarNameInTable="columnQR" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ZPL" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ZPL" msprop:Generator_ColumnVarNameInTable="columnZPL" msprop:Generator_ColumnPropNameInTable="ZPLColumn" msprop:Generator_UserColumnName="ZPL" minOccurs="0">
<xs:element name="ZPL" msprop:Generator_ColumnPropNameInTable="ZPLColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ZPL" msprop:Generator_UserColumnName="ZPL" msprop:Generator_ColumnVarNameInTable="columnZPL" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="1000" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="POS" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="POS" msprop:Generator_ColumnVarNameInTable="columnPOS" msprop:Generator_ColumnPropNameInTable="POSColumn" msprop:Generator_UserColumnName="POS" minOccurs="0">
<xs:element name="POS" msprop:Generator_ColumnPropNameInTable="POSColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="POS" msprop:Generator_UserColumnName="POS" msprop:Generator_ColumnVarNameInTable="columnPOS" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="LOC" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="LOC" msprop:Generator_ColumnVarNameInTable="columnLOC" msprop:Generator_ColumnPropNameInTable="LOCColumn" msprop:Generator_UserColumnName="LOC" minOccurs="0">
<xs:element name="LOC" msprop:Generator_ColumnPropNameInTable="LOCColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="LOC" msprop:Generator_UserColumnName="LOC" msprop:Generator_ColumnVarNameInTable="columnLOC" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ANGLE" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="ANGLE" msprop:Generator_ColumnVarNameInTable="columnANGLE" msprop:Generator_ColumnPropNameInTable="ANGLEColumn" msprop:Generator_UserColumnName="ANGLE" type="xs:double" minOccurs="0" />
<xs:element name="QTY" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="QTY" msprop:Generator_ColumnVarNameInTable="columnQTY" msprop:Generator_ColumnPropNameInTable="QTYColumn" msprop:Generator_UserColumnName="QTY" type="xs:int" minOccurs="0" />
<xs:element name="QTY0" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="QTY0" msprop:Generator_ColumnVarNameInTable="columnQTY0" msprop:Generator_ColumnPropNameInTable="QTY0Column" msprop:Generator_UserColumnName="QTY0" type="xs:int" minOccurs="0" />
<xs:element name="VNAME" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="VNAME" msprop:Generator_ColumnVarNameInTable="columnVNAME" msprop:Generator_ColumnPropNameInTable="VNAMEColumn" msprop:Generator_UserColumnName="VNAME" minOccurs="0">
<xs:element name="ANGLE" msprop:Generator_ColumnPropNameInTable="ANGLEColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="ANGLE" msprop:Generator_UserColumnName="ANGLE" msprop:Generator_ColumnVarNameInTable="columnANGLE" type="xs:double" minOccurs="0" />
<xs:element name="QTY" msprop:Generator_ColumnPropNameInTable="QTYColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="QTY" msprop:Generator_UserColumnName="QTY" msprop:Generator_ColumnVarNameInTable="columnQTY" type="xs:int" minOccurs="0" />
<xs:element name="QTY0" msprop:Generator_ColumnPropNameInTable="QTY0Column" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="QTY0" msprop:Generator_UserColumnName="QTY0" msprop:Generator_ColumnVarNameInTable="columnQTY0" type="xs:int" minOccurs="0" />
<xs:element name="VNAME" msprop:Generator_ColumnPropNameInTable="VNAMEColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="VNAME" msprop:Generator_UserColumnName="VNAME" msprop:Generator_ColumnVarNameInTable="columnVNAME" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="PRNATTACH" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="PRNATTACH" msprop:Generator_ColumnVarNameInTable="columnPRNATTACH" msprop:Generator_ColumnPropNameInTable="PRNATTACHColumn" msprop:Generator_UserColumnName="PRNATTACH" type="xs:boolean" minOccurs="0" />
<xs:element name="PRNVALID" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="PRNVALID" msprop:Generator_ColumnVarNameInTable="columnPRNVALID" msprop:Generator_ColumnPropNameInTable="PRNVALIDColumn" msprop:Generator_UserColumnName="PRNVALID" type="xs:boolean" minOccurs="0" />
<xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
<xs:element name="VLOT" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="VLOT" msprop:Generator_ColumnVarNameInTable="columnVLOT" msprop:Generator_ColumnPropNameInTable="VLOTColumn" msprop:Generator_UserColumnName="VLOT" minOccurs="0">
<xs:element name="PRNATTACH" msprop:Generator_ColumnPropNameInTable="PRNATTACHColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="PRNATTACH" msprop:Generator_UserColumnName="PRNATTACH" msprop:Generator_ColumnVarNameInTable="columnPRNATTACH" type="xs:boolean" minOccurs="0" />
<xs:element name="PRNVALID" msprop:Generator_ColumnPropNameInTable="PRNVALIDColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="PRNVALID" msprop:Generator_UserColumnName="PRNVALID" msprop:Generator_ColumnVarNameInTable="columnPRNVALID" type="xs:boolean" minOccurs="0" />
<xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
<xs:element name="VLOT" msprop:Generator_ColumnPropNameInTable="VLOTColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="VLOT" msprop:Generator_UserColumnName="VLOT" msprop:Generator_ColumnVarNameInTable="columnVLOT" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="BATCH" msprop:Generator_ColumnVarNameInTable="columnBATCH" msprop:Generator_ColumnPropNameInRow="BATCH" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="BATCHColumn" msprop:Generator_UserColumnName="BATCH" minOccurs="0">
<xs:element name="BATCH" msprop:Generator_ColumnPropNameInTable="BATCHColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="BATCH" msprop:Generator_UserColumnName="BATCH" msprop:Generator_ColumnVarNameInTable="columnBATCH" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="qtymax" msprop:Generator_ColumnVarNameInTable="columnqtymax" msprop:Generator_ColumnPropNameInRow="qtymax" msprop:Generator_ColumnPropNameInTable="qtymaxColumn" msprop:Generator_UserColumnName="qtymax" type="xs:int" minOccurs="0" />
<xs:element name="qtymax" msprop:Generator_ColumnPropNameInRow="qtymax" msprop:Generator_ColumnPropNameInTable="qtymaxColumn" msprop:Generator_ColumnVarNameInTable="columnqtymax" msprop:Generator_UserColumnName="qtymax" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Component_Reel_Result" />
<xs:selector xpath=".//mstns:K4EE_Component_Reel_Result" />
<xs:field xpath="mstns:idx" />
</xs:unique>
</xs:element>

View File

@@ -4,9 +4,9 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="205" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="205" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Component_Reel_Result" ZOrder="1" X="360" Y="58" Height="685" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="617" />
<Shape ID="DesignTable:K4EE_Component_Reel_Result" ZOrder="1" X="360" Y="58" Height="685" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="617" />
</Shapes>
<Connectors />
</DiagramLayout>

View File

@@ -12,7 +12,7 @@ namespace ResultView.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -123,9 +123,8 @@ namespace ResultView.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Inf" +
"o=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D;Encrypt=False;TrustServerCertific" +
"ate=True")]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;Use" +
"r ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True")]
public string cs {
get {
return ((string)(this["cs"]));

View File

@@ -84,10 +84,10 @@
<Setting Name="cs" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True</Value>
<Value Profile="(Default)">Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -35,6 +35,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="arControl.Net4">
<HintPath>..\DLL\arControl.Net4.dll</HintPath>
</Reference>
<Reference Include="ArLog.Net4, Version=19.7.18.1730, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\ArLog.Net4.dll</HintPath>

View File

@@ -6,7 +6,7 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="ResultView.Properties.Settings.cs" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True"
<add name="ResultView.Properties.Settings.cs" 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"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup><userSettings>

View File

@@ -226,29 +226,11 @@ namespace AR
#region "function"
[Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public Boolean Force_JobEndBuzzer { get; set; }
//[Browsable(false)]
//public Boolean Enable_ConveryorMode { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F0 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F1 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F2 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R0 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R1 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R2 { get; set; }
[Browsable(false)]
public Boolean Disable_Buzzer { get; set; }
[Browsable(false)]
public Boolean Enable_Magnet0 { get; set; }

View File

@@ -47,6 +47,25 @@ namespace AR
#endregion
[Category("Door Safty"),DisplayName("Disable Front - Left")]
public Boolean Disable_safty_F0 { get; set; }
[Category("Door Safty"), DisplayName("Disable Front - Center")]
public Boolean Disable_safty_F1 { get; set; }
[Category("Door Safty"), DisplayName("Disable Front - Right")]
public Boolean Disable_safty_F2 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Left")]
public Boolean Disable_safty_R0 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Center")]
public Boolean Disable_safty_R1 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Right")]
public Boolean Disable_safty_R2 { get; set; }
public SystemSetting()
{
this.filename = UTIL.CurrentPath + "system.xml";

View File

@@ -67,8 +67,6 @@ namespace UIControl
public int ConveyorRunPoint = 1; //컨베어 모터 이동시 이동 화살표의 위치값(내부 타이머에의해 증가함)
public double arMcLengthW = 1460;
public double arMcLengthH = 1350;//
public Boolean arJoystickOn = false;
public int arJoystickGroup = 0;
public bool CVLeftBusy = false;
public bool CVLeftReady = false;
public bool CVRightBusy = false;
@@ -867,30 +865,6 @@ namespace UIControl
if (this.Scean == eScean.Nomal) Scean_Normal(e.Graphics);
else if (this.Scean == eScean.MotHome) Scean_MotHome(e.Graphics);
else if (this.Scean == eScean.xmove) Scean_XMove(e.Graphics);
//조이스틱표시
if (arJoystickOn)
{
var joyname = string.Empty;
if (arJoystickGroup == 0) joyname = "PICKER X/Z";
else if (arJoystickGroup == 1) joyname = "LEFT Y/Z";
else if (arJoystickGroup == 2) joyname = "RIGHT Y/Z";
else if (arJoystickGroup == 3) joyname = "THETA";
else joyname = arJoystickGroup.ToString();
var joystr = "JOYSTICK(" + joyname + ")";
var joyfsize = e.Graphics.MeasureString(joystr, this.Font);
var joyrect = new Rectangle(0, 0, (int)(joyfsize.Width * 1.1), (int)(joyfsize.Height * 1.1));
e.Graphics.FillRectangle(Brushes.Black, joyrect);
e.Graphics.DrawString(joystr, this.Font,
Brushes.Gold,
joyrect,
new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
e.Graphics.DrawRect(joyrect, Color.Black, 3);
}
}
/// <summary>

1
Handler/run_claude.bat Normal file
View File

@@ -0,0 +1 @@
claude --dangerously-skip-permissions