-Insert data in model_log using unit system
-Adjust carton,main and login from with parameter based work. -Fix sound player -Update version 1.0.0.2main
parent
2611e5b67e
commit
da47883469
Binary file not shown.
Binary file not shown.
BIN
.vs/AVS/v16/.suo
BIN
.vs/AVS/v16/.suo
Binary file not shown.
BIN
.vs/AVS/v17/.suo
BIN
.vs/AVS/v17/.suo
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -5,7 +5,7 @@
|
|||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<FileVersion>1.0.0.0</FileVersion>
|
||||
<AssemblyVersion>1.0.0.1</AssemblyVersion>
|
||||
<AssemblyVersion>1.0.0.2</AssemblyVersion>
|
||||
<ApplicationIcon />
|
||||
<Win32Resource />
|
||||
</PropertyGroup>
|
||||
|
@ -41,7 +41,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="MaterialSkin" Version="0.2.1" />
|
||||
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
|
||||
<PackageReference Include="MySql.Data" Version="8.1.0" />
|
||||
<PackageReference Include="MySql.Data" Version="9.3.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="SerialPortStream" Version="2.4.1" />
|
||||
<PackageReference Include="SharpCompress" Version="0.38.0" />
|
||||
|
|
|
@ -15,13 +15,18 @@ namespace AVS
|
|||
{
|
||||
public SoundPlayer soundPlayer = new SoundPlayer();
|
||||
public int ID;
|
||||
|
||||
public CartonForm(string modelNO, int id)
|
||||
MODELLog log = new MODELLog();
|
||||
SKULog skulog;
|
||||
DailyLog dailylog;
|
||||
LiteDbClass liteDbClass = new LiteDbClass(null);
|
||||
public CartonForm(string modelNO, int id, DailyLog dailylog, SKULog skulog)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.ControlBox = false;
|
||||
txt_model_no.Text = modelNO;
|
||||
ID = id;
|
||||
this.skulog = skulog;
|
||||
this.dailylog = dailylog;
|
||||
}
|
||||
|
||||
private void txt_barcode_KeyPress(object sender, KeyPressEventArgs e)
|
||||
|
@ -36,26 +41,38 @@ namespace AVS
|
|||
//Remove unique date from shipping mark
|
||||
if (txt_barcode.Text.Contains(";"))
|
||||
{
|
||||
txt_barcode.Text = txt_barcode.Text.Split(';')[0].Trim();
|
||||
|
||||
var parts = txt_barcode.Text.Split(';');
|
||||
txt_barcode.Text = parts[0].Trim();
|
||||
log.QR = parts.Length > 1 ? parts[1].Trim() : string.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
log.QR = txt_barcode.Text.ToUpper().TrimEnd();
|
||||
}
|
||||
|
||||
if (txt_model_no.Text.ToUpper().TrimEnd() == txt_barcode.Text.ToUpper().TrimEnd())
|
||||
{
|
||||
|
||||
lbl_status.ForeColor = Color.Green;
|
||||
lbl_status.Text = "CARTON MATCHED";
|
||||
panel1.Visible = false;
|
||||
// Optionally hide the form without closing
|
||||
HideFormOrReset();
|
||||
// Set up a timer to close the form after 5 seconds
|
||||
////Timer timer = new Timer();
|
||||
////timer.Interval = 1000; // 5 seconds
|
||||
////timer.Tick += (s, args) =>
|
||||
////{
|
||||
//// timer.Stop(); // Stop the timer
|
||||
//// this.Close(); // Close the form
|
||||
////};
|
||||
////timer.Start();
|
||||
|
||||
|
||||
// Create carton entry
|
||||
string formattedDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
log.MODEL_NO = txt_model_no.Text.ToUpper().TrimEnd();
|
||||
log.SYS_IP = dailylog.SYS_IP;
|
||||
log.RECORD_DATE = DateTime.Parse(formattedDate);
|
||||
log.USER_ID = skulog.USER_ID;
|
||||
log.LIVE_WEIGHT = Convert.ToDecimal(skulog.ItemsPerBox) * Convert.ToDecimal(skulog.NetWeightKg);
|
||||
log.PC_NAME = dailylog.PC_NAME;
|
||||
log.MARKET_PLACE = skulog.MARKET_PLACE;
|
||||
log.USER_ID = dailylog.USER_ID;
|
||||
|
||||
liteDbClass.InsertRecord("MODELLogs", log, "CONTAINER_NO", "MODEL_NO");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -67,12 +84,13 @@ namespace AVS
|
|||
lbl_status.ForeColor = Color.Red;
|
||||
lbl_status.Text = "WRONG CARTON";
|
||||
showControls();
|
||||
//PlayAlertSound();
|
||||
PlayAlertSound();
|
||||
|
||||
|
||||
this.Hide(); // Hide the MainForm
|
||||
LoginForm loginForm = new LoginForm(this, false,null);
|
||||
loginForm.Show();
|
||||
LoginForm loginForm = new LoginForm(this, false, "SHIPPING");
|
||||
loginForm.StartPosition = FormStartPosition.CenterParent; // optional: center over parent
|
||||
loginForm.ShowDialog(this); // ✅ Blocks current form and stays on top
|
||||
|
||||
}
|
||||
|
||||
|
@ -117,7 +135,7 @@ namespace AVS
|
|||
{
|
||||
if (soundPlayer != null)
|
||||
{
|
||||
soundPlayer.Stop();
|
||||
//soundPlayer.Stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
163
LiteDbClass.cs
163
LiteDbClass.cs
|
@ -67,7 +67,39 @@ namespace AVS
|
|||
Console.WriteLine($"Error closing SQLite connection: {ex.Message}");
|
||||
}
|
||||
}
|
||||
public bool InsertOrUpdateWeightTolerance(string FNSKU, string market_place, double weight_tolerance, string avs_name)
|
||||
{
|
||||
try
|
||||
{
|
||||
OpenConnection();
|
||||
|
||||
string query = @"INSERT OR REPLACE INTO weight_tolerance
|
||||
(FNSKU, MARKET_PLACE, WEIGHT_TOLERANCE, WEIGHT_TOLERANCE_DATETIME)
|
||||
VALUES (@fnsku, @market_place, @weight_tolerance, @datetime)";
|
||||
|
||||
using (SQLiteCommand cmd = new SQLiteCommand(query, connection))
|
||||
{
|
||||
cmd.Parameters.AddWithValue("@fnsku", FNSKU);
|
||||
cmd.Parameters.AddWithValue("@market_place", market_place);
|
||||
cmd.Parameters.AddWithValue("@weight_tolerance", weight_tolerance);
|
||||
cmd.Parameters.AddWithValue("@datetime", DateTime.Now);
|
||||
|
||||
|
||||
cmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"InsertOrUpdate Error: {ex.Message}");
|
||||
return false;
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
}
|
||||
public void UpdateSKURecord(string tableName, string oldSKU, string newSKU)
|
||||
{
|
||||
try
|
||||
|
@ -104,7 +136,43 @@ namespace AVS
|
|||
CloseConnection();
|
||||
}
|
||||
}
|
||||
public double GetWeightTolerance(string fnsku, string marketPlace)
|
||||
{
|
||||
double weightTolerance = 0;
|
||||
|
||||
try
|
||||
{
|
||||
OpenConnection();
|
||||
|
||||
string query = @"
|
||||
SELECT weight_tolerance
|
||||
FROM weight_tolerance
|
||||
WHERE FNSKU = @fnsku AND MARKET_PLACE = @market_place";
|
||||
|
||||
using (SQLiteCommand cmd = new SQLiteCommand(query, connection))
|
||||
{
|
||||
cmd.Parameters.AddWithValue("@fnsku", fnsku);
|
||||
cmd.Parameters.AddWithValue("@market_place", marketPlace);
|
||||
|
||||
var result = cmd.ExecuteScalar();
|
||||
|
||||
if (result != null && result != DBNull.Value)
|
||||
{
|
||||
weightTolerance = Convert.ToDouble(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Error fetching weight tolerance: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
|
||||
return weightTolerance;
|
||||
}
|
||||
public void InsertRecord<T>(string tableName, T record, string property, string property2)
|
||||
{
|
||||
try
|
||||
|
@ -424,7 +492,7 @@ namespace AVS
|
|||
return LogList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public void DeleteRow(string FNSKU, string market_place)
|
||||
{
|
||||
|
@ -857,6 +925,93 @@ namespace AVS
|
|||
}
|
||||
}
|
||||
|
||||
public void CreateToleranceTable(string tableName, List<AVS.WeightTolerance.TableColumn> columns)
|
||||
{
|
||||
if (columns == null || columns.Count == 0)
|
||||
{
|
||||
Console.WriteLine("No columns provided to create the table.");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
OpenConnection();
|
||||
|
||||
// Check if table exists
|
||||
string tableExistsQuery = $"SELECT name FROM sqlite_master WHERE type='table' AND name=@tableName";
|
||||
bool tableExists = false;
|
||||
|
||||
using (SQLiteCommand checkTableCmd = new SQLiteCommand(tableExistsQuery, connection))
|
||||
{
|
||||
checkTableCmd.Parameters.AddWithValue("@tableName", tableName);
|
||||
|
||||
using (SQLiteDataReader reader = checkTableCmd.ExecuteReader())
|
||||
{
|
||||
tableExists = reader.HasRows;
|
||||
}
|
||||
}
|
||||
|
||||
if (!tableExists)
|
||||
{
|
||||
// Build columns definition
|
||||
string columnsDefinition = AVS.WeightTolerance.GetColumnsDefinition(columns);
|
||||
|
||||
// 🆕 ADD UNIQUE CONSTRAINT to table definition
|
||||
columnsDefinition += ", UNIQUE(FNSKU, MARKET_PLACE)";
|
||||
|
||||
string createTableCommand = $"CREATE TABLE \"{tableName}\" ({columnsDefinition})";
|
||||
|
||||
using (SQLiteCommand cmd = new SQLiteCommand(createTableCommand, connection))
|
||||
{
|
||||
cmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
Console.WriteLine($"Table '{tableName}' created with UNIQUE constraint on (FNSKU, MARKET_PLACE).");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Get existing columns once
|
||||
List<string> existingColumns = new List<string>();
|
||||
|
||||
string columnListQuery = $"PRAGMA table_info(\"{tableName}\")";
|
||||
using (SQLiteCommand getColumnsCmd = new SQLiteCommand(columnListQuery, connection))
|
||||
{
|
||||
using (SQLiteDataReader reader = getColumnsCmd.ExecuteReader())
|
||||
{
|
||||
while (reader.Read())
|
||||
{
|
||||
existingColumns.Add(reader["name"].ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Now check and add missing columns
|
||||
foreach (var column in columns)
|
||||
{
|
||||
if (!existingColumns.Contains(column.Name))
|
||||
{
|
||||
string addColumnCommand = $"ALTER TABLE \"{tableName}\" ADD COLUMN {column.Name} {column.DataType}";
|
||||
|
||||
using (SQLiteCommand addColumnCmd = new SQLiteCommand(addColumnCommand, connection))
|
||||
{
|
||||
addColumnCmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
Console.WriteLine($"Column '{column.Name}' added to table '{tableName}'.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Error creating or modifying table: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public async Task<List<MODELLog>> GetAllLogsFromDatabaseAsyncCarton()
|
||||
{
|
||||
|
@ -1122,19 +1277,19 @@ namespace AVS
|
|||
DeleteAllLogsFromDatabaseCarton();
|
||||
|
||||
|
||||
MessageBox.Show("DATA POSTED SUCCESSFULLY ! ");
|
||||
// MessageBox.Show("DATA POSTED SUCCESSFULLY ! ");
|
||||
_mainForm.btn_post_data.Enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("ERROR POSTING DATA ! " + response.StatusCode);
|
||||
// MessageBox.Show("ERROR POSTING DATA ! " + response.StatusCode);
|
||||
|
||||
_mainForm.btn_post_data.Enabled = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("NO DATA FOUND ! ");
|
||||
//MessageBox.Show("NO DATA FOUND ! ");
|
||||
_mainForm.btn_post_data.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
|
112
LoginForm.cs
112
LoginForm.cs
|
@ -13,6 +13,7 @@ namespace AVS
|
|||
public partial class LoginForm : MaterialForm
|
||||
{
|
||||
private MainForm mainForm = null;
|
||||
private CartonForm cartonForm = null;
|
||||
static ConnectionClass ConnectionClass = new ConnectionClass();
|
||||
SoundPlayer soundplayerNew = null;
|
||||
private static string SERVER_URL;
|
||||
|
@ -22,40 +23,72 @@ namespace AVS
|
|||
public static string password;
|
||||
public bool bool_cb_cont = false;
|
||||
|
||||
|
||||
public LoginForm(Form callingForm, bool val, string value)
|
||||
{
|
||||
InitializeComponent();
|
||||
if (callingForm != null)
|
||||
|
||||
if (val == true)
|
||||
{
|
||||
if (val == true)
|
||||
bool_cb_cont = true;
|
||||
}
|
||||
|
||||
if (callingForm is MainForm mf)
|
||||
{
|
||||
mainForm = mf;
|
||||
if (mainForm.soundPlayer != null)
|
||||
soundplayerNew = mainForm.soundPlayer;
|
||||
}
|
||||
else if (callingForm is CartonForm cf)
|
||||
{
|
||||
cartonForm = cf;
|
||||
if (cartonForm.soundPlayer != null)
|
||||
soundplayerNew = cartonForm.soundPlayer;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
// fallback player
|
||||
// soundplayerNew = new SoundPlayer();
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(value))
|
||||
{
|
||||
if (value == "LOGIN")
|
||||
{
|
||||
bool_cb_cont = true;
|
||||
lbl_wrong.Visible = false;
|
||||
lbl_login.Visible = true;
|
||||
}
|
||||
mainForm = callingForm as MainForm;
|
||||
soundplayerNew = mainForm.soundPlayer;
|
||||
if (value != null)
|
||||
else if (value == "LOGOUT")
|
||||
{
|
||||
lbl_wrong.Visible = true;
|
||||
lbl_login.Visible = false;
|
||||
lbl_wrong.Text = "Wrong Weight";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
lbl_wrong.Visible = true;
|
||||
lbl_login.Visible = false;
|
||||
}
|
||||
}
|
||||
lbl_wrong.Text = "Wrong Shipping Mark";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
lbl_wrong.Visible = true;
|
||||
lbl_login.Visible = false;
|
||||
// lbl_wrong.Text = "Wrong Shipping Mark";
|
||||
}
|
||||
|
||||
MaterialSkinClass.ApplySkin(this);
|
||||
ControlBox = false;
|
||||
|
||||
SERVER_URL = ConnectionClass.SERVER_URL.ToString();
|
||||
|
||||
}
|
||||
|
||||
private void LoginForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
//this.Activate();
|
||||
//this.Focus();
|
||||
|
||||
// If credentials exist, load them
|
||||
if (File.Exists(filePath))
|
||||
|
@ -100,21 +133,33 @@ namespace AVS
|
|||
|
||||
if (responseString != "Username or password incorrect")
|
||||
{
|
||||
if (soundplayerNew == null)
|
||||
{
|
||||
if (cb_remember.Checked)
|
||||
{
|
||||
saveCredentials();
|
||||
}
|
||||
|
||||
//if (cb_container.Checked)
|
||||
if (cb_carton.Checked)
|
||||
{
|
||||
bool_cb_cont = true;
|
||||
}
|
||||
this.Hide();
|
||||
MainForm mainForm = new MainForm(txt_userName.Text, bool_cb_cont);
|
||||
mainForm.Show();
|
||||
if (cb_remember.Checked)
|
||||
{
|
||||
saveCredentials();
|
||||
}
|
||||
|
||||
if (cb_carton.Checked)
|
||||
{
|
||||
bool_cb_cont = true;
|
||||
}
|
||||
|
||||
this.Hide();
|
||||
|
||||
if (mainForm != null)
|
||||
{
|
||||
mainForm.Show(); // restore original MainForm
|
||||
}
|
||||
else if (cartonForm != null)
|
||||
{
|
||||
cartonForm.soundPlayer.Stop(); // stop alarm
|
||||
cartonForm.Show(); // return to CartonForm
|
||||
}
|
||||
else
|
||||
{
|
||||
// fallback if both are null
|
||||
MainForm fallback = new MainForm(txt_userName.Text, bool_cb_cont);
|
||||
fallback.Show();
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -156,11 +201,16 @@ namespace AVS
|
|||
|
||||
private void CloseAlertWindow()
|
||||
{
|
||||
DateTime dt = DateTime.MinValue;
|
||||
this.mainForm.ScanTimeText = dt;
|
||||
DateTime dt = DateTime.Now;
|
||||
var openMainForm = Application.OpenForms.OfType<MainForm>().FirstOrDefault();
|
||||
|
||||
if (openMainForm != null)
|
||||
{
|
||||
openMainForm.ScanTimeText = dt;
|
||||
openMainForm.Show();
|
||||
}
|
||||
|
||||
this.Close();
|
||||
MainForm mainForm = Application.OpenForms.OfType<MainForm>().FirstOrDefault();
|
||||
mainForm?.Show();
|
||||
}
|
||||
|
||||
private static bool tryReadCredentials(out string username, out string password)
|
||||
|
|
|
@ -76,6 +76,7 @@ namespace AVS
|
|||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.lbl_counter = new System.Windows.Forms.Label();
|
||||
this.panel3 = new System.Windows.Forms.Panel();
|
||||
this.lbl_total = new System.Windows.Forms.Label();
|
||||
this.btn_save_tol = new System.Windows.Forms.Button();
|
||||
this.lbl_weightTolerance = new System.Windows.Forms.Label();
|
||||
this.txt_weight_tol = new System.Windows.Forms.TextBox();
|
||||
|
@ -755,6 +756,7 @@ namespace AVS
|
|||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel3.BackColor = System.Drawing.Color.Silver;
|
||||
this.panel3.Controls.Add(this.lbl_total);
|
||||
this.panel3.Controls.Add(this.btn_delete);
|
||||
this.panel3.Controls.Add(this.btn_save_tol);
|
||||
this.panel3.Controls.Add(this.btn_reset_port);
|
||||
|
@ -771,6 +773,20 @@ namespace AVS
|
|||
this.panel3.TabIndex = 52;
|
||||
this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint);
|
||||
//
|
||||
// lbl_total
|
||||
//
|
||||
this.lbl_total.AutoSize = true;
|
||||
this.lbl_total.BackColor = System.Drawing.Color.Transparent;
|
||||
this.lbl_total.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
|
||||
this.lbl_total.Font = new System.Drawing.Font("Arial", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
|
||||
this.lbl_total.ForeColor = System.Drawing.Color.Black;
|
||||
this.lbl_total.Location = new System.Drawing.Point(35, 88);
|
||||
this.lbl_total.Name = "lbl_total";
|
||||
this.lbl_total.Size = new System.Drawing.Size(141, 39);
|
||||
this.lbl_total.TabIndex = 58;
|
||||
this.lbl_total.Text = "Total : 0";
|
||||
this.lbl_total.Visible = false;
|
||||
//
|
||||
// btn_save_tol
|
||||
//
|
||||
this.btn_save_tol.Location = new System.Drawing.Point(251, 128);
|
||||
|
@ -912,6 +928,7 @@ namespace AVS
|
|||
private System.Windows.Forms.Button btn_save_tol;
|
||||
private System.Windows.Forms.Label lbl_weightTolerance;
|
||||
private System.Windows.Forms.TextBox txt_weight_tol;
|
||||
private System.Windows.Forms.Label lbl_total;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
74
MainForm.cs
74
MainForm.cs
|
@ -36,6 +36,7 @@ namespace AVS
|
|||
{
|
||||
public partial class MainForm : MaterialForm
|
||||
{
|
||||
|
||||
// Define the necessary P/Invoke signatures
|
||||
const uint DIGCF_PRESENT = 0x00000002;
|
||||
const uint DIGCF_ALLCLASSES = 0x00000004;
|
||||
|
@ -118,10 +119,15 @@ namespace AVS
|
|||
|
||||
private System.Threading.Timer _timer;
|
||||
|
||||
|
||||
|
||||
WeightTolerance WeightTolerance = new WeightTolerance();
|
||||
//[STAThread]
|
||||
|
||||
public SoundPlayer soundPlayer = new SoundPlayer();
|
||||
|
||||
private System.Timers.Timer backgroundTimer;
|
||||
private MySqlConnectivity dbHelper;
|
||||
public MainForm(string userId, bool cb_carton)
|
||||
{
|
||||
this.AutoScaleMode = AutoScaleMode.Dpi;
|
||||
|
@ -147,13 +153,19 @@ namespace AVS
|
|||
|
||||
liteDbClass.CheckAndCreateDb();
|
||||
|
||||
|
||||
List<MODELLog.TableColumn> column = MODELLogTable.GetColumns();
|
||||
liteDbClass.CreateMODELlogTable("MODELLogs", column);
|
||||
if (cb_carton == true)
|
||||
{
|
||||
global_cb_carton = true;
|
||||
List<MODELLog.TableColumn> columns = MODELLogTable.GetColumns();
|
||||
liteDbClass.CreateMODELlogTable("MODELLogs", columns);
|
||||
|
||||
dataGridView.DataSource = liteDbClass.showModelData();
|
||||
|
||||
|
||||
int total = dataGridView.Rows.Count;
|
||||
lbl_total.Text = "Total : "+total.ToString();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -164,6 +176,10 @@ namespace AVS
|
|||
dataGridView.DataSource = liteDbClass.showData();
|
||||
|
||||
|
||||
List<WeightTolerance.TableColumn> WeightToleranceColumns = AVS.WeightTolerance.WeightToleranceTable.GetColumns();
|
||||
liteDbClass.CreateToleranceTable("Weight_Tolerance", WeightToleranceColumns);
|
||||
|
||||
|
||||
}
|
||||
|
||||
fillMarketPlaces();
|
||||
|
@ -173,7 +189,8 @@ namespace AVS
|
|||
|
||||
|
||||
showToolTips();
|
||||
|
||||
dbHelper = new MySqlConnectivity();
|
||||
StartBackgroundTask();
|
||||
}
|
||||
public void showToolTips()
|
||||
{
|
||||
|
@ -243,7 +260,7 @@ namespace AVS
|
|||
MessageBox.Show("Please select SKU !");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
//FOR ONLY CARTON ----------------------------------------------
|
||||
|
@ -268,6 +285,8 @@ namespace AVS
|
|||
|
||||
// You can use these parts as needed. For example:
|
||||
_ = VerifyBarcodeCarton(part1, "CONT", "", cb_marketplace.Text);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -367,7 +386,7 @@ namespace AVS
|
|||
public void VerifyBarcodeOffline(string barcode)
|
||||
{
|
||||
lbl_error.Visible = false;
|
||||
if (Convert.ToDouble(lbl_hold_weight.Text) > 0.121)
|
||||
if (Convert.ToDouble(lbl_hold_weight.Text) > 0.121)
|
||||
{
|
||||
|
||||
count++;
|
||||
|
@ -392,8 +411,8 @@ namespace AVS
|
|||
IS_FNSKU_WRONG = false,
|
||||
IS_WEIGHT_WRONG = false,
|
||||
USER_ID = userID,
|
||||
MODEL_NO = log.MODEL_NO,
|
||||
NET_WEIGHT = Convert.ToDecimal(log.NET_WEIGHT),
|
||||
MODEL_NO = SKULog.ModelNo,
|
||||
NET_WEIGHT = Convert.ToDecimal(SKULog.NetWeightKg),
|
||||
MARKET_PLACE = SKULog.MARKET_PLACE,
|
||||
PC_NAME = userTextBox.Text.ToString().ToUpper()
|
||||
|
||||
|
@ -413,12 +432,12 @@ namespace AVS
|
|||
if (int_item_count > 0)
|
||||
{
|
||||
|
||||
if (Convert.ToDouble(lbl_hold_weight.Text) > 0.121)
|
||||
if (Convert.ToDouble(lbl_hold_weight.Text) > 0.121)
|
||||
{
|
||||
boxcount++;
|
||||
lbl_boxCount.Text = "Box count : " + boxcount.ToString();
|
||||
int id = liteDbClass.GetLastRecord();
|
||||
OpenCartonForm(id);
|
||||
OpenCartonForm(id, Dailylog);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -476,9 +495,10 @@ namespace AVS
|
|||
IS_FNSKU_WRONG = isFnskuWrong,
|
||||
IS_WEIGHT_WRONG = isWeightWrong,
|
||||
USER_ID = userID,
|
||||
MODEL_NO = "",
|
||||
NET_WEIGHT = 0,
|
||||
PC_NAME = userTextBox.Text.ToString().ToUpper()
|
||||
MODEL_NO = SKULog.ModelNo,
|
||||
NET_WEIGHT = Convert.ToDecimal(SKULog.NetWeightKg),
|
||||
PC_NAME = userTextBox.Text.ToString().ToUpper(),
|
||||
MARKET_PLACE = SKULog.MARKET_PLACE
|
||||
|
||||
};
|
||||
liteDbClass.InsertRecord("DailyLogs", dailyLog, "SKU", null);
|
||||
|
@ -940,9 +960,9 @@ namespace AVS
|
|||
LoginForm = new LoginForm(this, val, value);
|
||||
LoginForm.Show();
|
||||
}
|
||||
private void OpenCartonForm(int id)
|
||||
private void OpenCartonForm(int id , DailyLog dailyLog)
|
||||
{
|
||||
CartonForm cartonForm = new CartonForm(SKULog.ModelNo.Trim(), id);
|
||||
CartonForm cartonForm = new CartonForm(SKULog.ModelNo.Trim(), id, dailyLog, SKULog);
|
||||
|
||||
// Disable the maximize and minimize buttons
|
||||
cartonForm.MaximizeBox = false;
|
||||
|
@ -996,6 +1016,7 @@ namespace AVS
|
|||
lblBarcode.Text = "Model #";
|
||||
txt_barcode.MaxLength = 50;
|
||||
panel3.Visible = true;
|
||||
lbl_total.Visible = true;
|
||||
|
||||
}
|
||||
|
||||
|
@ -1099,6 +1120,7 @@ namespace AVS
|
|||
lbl_counter.Visible = true;
|
||||
lbl_item_box.Visible = true;
|
||||
lbl_boxCount.Visible = true;
|
||||
lbl_total.Visible = false;
|
||||
}
|
||||
|
||||
//timer_weighing.Interval = 1000;
|
||||
|
@ -1208,7 +1230,7 @@ namespace AVS
|
|||
SKULog.MARKET_PLACE = selectedRow.Cells["MARKET_PLACE"].Value.ToString();
|
||||
lbl_market_place.Text = SKULog.MARKET_PLACE;
|
||||
lbl_counter.Text = "Item count : " + liteDbClass.FillCounts(lbl_fnsku.Text, lbl_market_place.Text).ToString();
|
||||
txt_weight_tol.Text = WeightTolerance.GetWeightTolerance(fnsku, SKULog.MARKET_PLACE).ToString();
|
||||
txt_weight_tol.Text = liteDbClass.GetWeightTolerance(fnsku, SKULog.MARKET_PLACE).ToString();
|
||||
if (Int16.TryParse(Regex.Match(lbl_counter.Text, @"\d+").Value, out Int16 countt) &&
|
||||
Int16.TryParse(Regex.Match(lbl_item_box.Text, @"\d+").Value, out Int16 itemPerBox))
|
||||
{
|
||||
|
@ -1248,10 +1270,7 @@ namespace AVS
|
|||
|
||||
|
||||
|
||||
private void btn_postData_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void btn_update_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
@ -1281,7 +1300,7 @@ namespace AVS
|
|||
File.Delete(filePath);
|
||||
|
||||
this.Close();
|
||||
LoginForm form = new LoginForm(null, false,null);
|
||||
LoginForm form = new LoginForm(null, false,"LOGOUT");
|
||||
form.Show();
|
||||
}
|
||||
|
||||
|
@ -1527,7 +1546,7 @@ namespace AVS
|
|||
}
|
||||
|
||||
// Run the update process in another thread
|
||||
_ = Task.Delay(500).ContinueWith(async _ => await RunUpdateProcessAsync());
|
||||
// _ = Task.Delay(500).ContinueWith(async _ => await RunUpdateProcessAsync());
|
||||
|
||||
}
|
||||
|
||||
|
@ -1748,8 +1767,6 @@ namespace AVS
|
|||
|
||||
public void btn_post_data_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
|
||||
// Disable the button to prevent multiple clicks
|
||||
btn_post_data.Enabled = false;
|
||||
try
|
||||
|
@ -1764,6 +1781,7 @@ namespace AVS
|
|||
{
|
||||
|
||||
liteDbClass.postDataAsync();
|
||||
liteDbClass.postDataAsyncCarton();
|
||||
count = 0;
|
||||
lbl_counter.Text = "Item count : " + count;
|
||||
boxcount = 0;
|
||||
|
@ -2037,7 +2055,7 @@ namespace AVS
|
|||
SKULog.MARKET_PLACE = selectedRow.Cells["MARKET_PLACE"].Value?.ToString();
|
||||
double weightTolerance = Convert.ToDouble(txt_weight_tol.Text);
|
||||
|
||||
bool result = WeightTolerance.InsertOrUpdateWeightTolerance(fnsku, SKULog.MARKET_PLACE, weightTolerance, userTextBox.Text);
|
||||
bool result = liteDbClass.InsertOrUpdateWeightTolerance(fnsku, SKULog.MARKET_PLACE, weightTolerance, userTextBox.Text);
|
||||
|
||||
if (result == true)
|
||||
{
|
||||
|
@ -2072,6 +2090,14 @@ namespace AVS
|
|||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
private void StartBackgroundTask()
|
||||
{
|
||||
backgroundTimer = new System.Timers.Timer();
|
||||
backgroundTimer.Interval = TimeSpan.FromMinutes(30).TotalMilliseconds; // every 30 mins
|
||||
backgroundTimer.Elapsed += (sender, args) => dbHelper.UpdateClientActivity((userTextBox.Text));
|
||||
backgroundTimer.AutoReset = true;
|
||||
backgroundTimer.Start();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,73 @@
|
|||
using MySql.Data.MySqlClient;
|
||||
using System;
|
||||
using System.Net.NetworkInformation;
|
||||
|
||||
namespace AVS
|
||||
{
|
||||
class MySqlConnectivity
|
||||
{
|
||||
private readonly string connectionString = "server=utopia-2.c5qech8o9lgg.us-east-1.rds.amazonaws.com;user=itemVerification;password=itemVerification01;database=item_verification_system";
|
||||
|
||||
public void UpdateClientActivity(string pcName)
|
||||
{
|
||||
if (!IsInternetAvailable())
|
||||
return;
|
||||
|
||||
using (var conn = new MySqlConnection(connectionString))
|
||||
{
|
||||
conn.Open();
|
||||
|
||||
long count = 0;
|
||||
|
||||
// First check if line_name exists
|
||||
string checkQuery = "SELECT COUNT(*) FROM avs_line WHERE line_name = @pcName";
|
||||
using (var cmd = new MySqlCommand(checkQuery, conn))
|
||||
{
|
||||
cmd.Parameters.AddWithValue("@pcName", pcName);
|
||||
count = Convert.ToInt64(cmd.ExecuteScalar());
|
||||
}
|
||||
|
||||
string dateTimeNow = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
string updateQuery = "UPDATE avs_line SET last_client_activity = @date WHERE line_name = @pcName";
|
||||
using (var updateCmd = new MySqlCommand(updateQuery, conn))
|
||||
{
|
||||
updateCmd.Parameters.AddWithValue("@pcName", pcName);
|
||||
updateCmd.Parameters.AddWithValue("@date", dateTimeNow); // ✅ correct assignment
|
||||
updateCmd.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
string insertQuery = @"
|
||||
INSERT INTO avs_line
|
||||
(line_name, site, department, floor, device_type, status, last_client_activity, created_at, department_id)
|
||||
VALUES (@pcName, '', '', '', 'PC', 1, @date, @date, 0)";
|
||||
using (var insertCmd = new MySqlCommand(insertQuery, conn))
|
||||
{
|
||||
insertCmd.Parameters.AddWithValue("@pcName", pcName);
|
||||
insertCmd.Parameters.AddWithValue("@date", dateTimeNow); // ✅ correct assignment
|
||||
insertCmd.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
private bool IsInternetAvailable()
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var ping = new Ping())
|
||||
{
|
||||
var reply = ping.Send("8.8.8.8", 3000);
|
||||
return reply.Status == IPStatus.Success;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
54
Program.cs
54
Program.cs
|
@ -28,33 +28,33 @@ namespace AVS
|
|||
// Path to save the extracted updater file
|
||||
string updaterPath = Path.Combine(Path.GetTempPath(), "AVSUpdater.exe");
|
||||
|
||||
// Check if the updater file already exists
|
||||
if (!File.Exists(updaterPath))
|
||||
{
|
||||
// Access the embedded resource stream
|
||||
using (var resourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("AVS.AVSUpdater.exe"))
|
||||
{
|
||||
if (resourceStream != null)
|
||||
{
|
||||
// Create a new file in the temporary folder
|
||||
using (var fileStream = new FileStream(updaterPath, FileMode.Create, FileAccess.Write))
|
||||
{
|
||||
// Copy the content of the resource stream to the file
|
||||
resourceStream.CopyTo(fileStream);
|
||||
}
|
||||
//// Check if the updater file already exists
|
||||
//if (!File.Exists(updaterPath))
|
||||
//{
|
||||
// // Access the embedded resource stream
|
||||
// using (var resourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("AVS.AVSUpdater.exe"))
|
||||
// {
|
||||
// if (resourceStream != null)
|
||||
// {
|
||||
// // Create a new file in the temporary folder
|
||||
// using (var fileStream = new FileStream(updaterPath, FileMode.Create, FileAccess.Write))
|
||||
// {
|
||||
// // Copy the content of the resource stream to the file
|
||||
// resourceStream.CopyTo(fileStream);
|
||||
// }
|
||||
|
||||
Console.WriteLine($"Updater extracted to {updaterPath}");
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Embedded resource not found.");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Updater already exists.");
|
||||
}
|
||||
// Console.WriteLine($"Updater extracted to {updaterPath}");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Console.WriteLine("Embedded resource not found.");
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// Console.WriteLine("Updater already exists.");
|
||||
//}
|
||||
|
||||
|
||||
//if (System.Diagnostics.Process.GetProcessesByName(System.IO.Path.GetFileNameWithoutExtension(System.Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1)
|
||||
|
@ -71,7 +71,7 @@ namespace AVS
|
|||
else
|
||||
{
|
||||
|
||||
Application.Run(new LoginForm(null,false,null));
|
||||
Application.Run(new LoginForm(null,false,"LOGIN"));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
-->
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<History>True|2025-04-25T07:28:18.3725903Z;True|2025-04-25T12:27:54.3223053+05:00;</History>
|
||||
<History>True|2025-07-14T09:43:47.5107620Z;True|2025-07-08T16:37:37.0141086+05:00;True|2025-07-08T13:42:10.6403891+05:00;True|2025-07-08T13:35:02.4733585+05:00;True|2025-04-28T13:14:25.0043986+05:00;True|2025-04-25T12:28:18.3725903+05:00;True|2025-04-25T12:27:54.3223053+05:00;</History>
|
||||
</PropertyGroup>
|
||||
</Project>
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Data.SQLite;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
|
||||
|
@ -10,51 +11,22 @@ namespace AVS
|
|||
{
|
||||
internal class WeightTolerance
|
||||
{
|
||||
public string FNSKU { get; set; }
|
||||
|
||||
public double WEIGHT_TOLERANCE { get; set; }
|
||||
public DateTime WEIGHT_TOLERANCE_DATETIME { get; set; }
|
||||
public string MARKET_PLACE { get; set; }
|
||||
|
||||
|
||||
private MySqlConnection connection;
|
||||
|
||||
private string connectionString = "server=utopia-2.c5qech8o9lgg.us-east-1.rds.amazonaws.com;user=itemVerification;password=itemVerification01;database=item_verification_system;";
|
||||
public bool InsertOrUpdateWeightTolerance(string FNSKU, string market_place, double weight_tolerance , string avs_name)
|
||||
{
|
||||
try
|
||||
{
|
||||
OpenConnection();
|
||||
|
||||
string query = @"INSERT INTO weight_tolerance (FNSKU, MARKET_PLACE, WEIGHT ,WEIGHT_DATETIME,WEIGHT_ADD_BY)
|
||||
VALUES (@fnsku, @market_place, @weight_tolerance , @datetime , @avs_name )
|
||||
ON DUPLICATE KEY UPDATE WEIGHT = VALUES(WEIGHT)";
|
||||
|
||||
using (MySqlCommand cmd = new MySqlCommand(query, connection))
|
||||
{
|
||||
cmd.Parameters.AddWithValue("@fnsku", FNSKU);
|
||||
cmd.Parameters.AddWithValue("@market_place", market_place);
|
||||
cmd.Parameters.AddWithValue("@weight_tolerance", weight_tolerance);
|
||||
cmd.Parameters.AddWithValue("@datetime", DateTime.Now);
|
||||
cmd.Parameters.AddWithValue("@avs_name", avs_name);
|
||||
|
||||
cmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"InsertOrUpdate Error: {ex.Message}");
|
||||
return false;
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public MySqlConnection OpenConnection()
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
// Open the Mysql connection
|
||||
connection = new MySqlConnection(connectionString);
|
||||
connection.Open();
|
||||
|
@ -64,9 +36,9 @@ namespace AVS
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
|
||||
Console.WriteLine($"Error opening SQLite connection: {ex.Message}");
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -86,44 +58,35 @@ namespace AVS
|
|||
}
|
||||
}
|
||||
|
||||
public double GetWeightTolerance(string fnsku, string marketPlace)
|
||||
|
||||
|
||||
public class TableColumn
|
||||
{
|
||||
double weightTolerance = 0;
|
||||
|
||||
try
|
||||
{
|
||||
OpenConnection();
|
||||
|
||||
string query = @"
|
||||
SELECT WEIGHT
|
||||
FROM weight_tolerance
|
||||
WHERE FNSKU = @fnsku AND MARKET_PLACE = @market_place";
|
||||
|
||||
using (MySqlCommand cmd = new MySqlCommand(query, connection))
|
||||
{
|
||||
cmd.Parameters.AddWithValue("@fnsku", fnsku);
|
||||
cmd.Parameters.AddWithValue("@market_place", marketPlace);
|
||||
|
||||
var result = cmd.ExecuteScalar();
|
||||
|
||||
if (result != null && result != DBNull.Value)
|
||||
{
|
||||
weightTolerance = Convert.ToDouble(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Error fetching weight tolerance: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
|
||||
return weightTolerance;
|
||||
public string Name { get; set; }
|
||||
public string DataType { get; set; }
|
||||
}
|
||||
|
||||
public class WeightToleranceTable
|
||||
{
|
||||
public static List<TableColumn> GetColumns()
|
||||
{
|
||||
return new List<TableColumn>
|
||||
{
|
||||
new TableColumn { Name = "Id", DataType = "INTEGER PRIMARY KEY AUTOINCREMENT" },
|
||||
new TableColumn { Name = "FNSKU", DataType = "TEXT" },
|
||||
|
||||
new TableColumn { Name = "WEIGHT_TOLERANCE_DATETIME", DataType = "DATETIME" },
|
||||
new TableColumn { Name = "WEIGHT_TOLERANCE", DataType = "REAL" },
|
||||
|
||||
new TableColumn { Name = "MARKET_PLACE", DataType = "TEXT" },
|
||||
};
|
||||
}
|
||||
}
|
||||
public static string GetColumnsDefinition(List<TableColumn> columns)
|
||||
{
|
||||
// Convert the list of columns into a string for the CREATE TABLE command
|
||||
return string.Join(", ", columns.Select(c => $"{c.Name} {c.DataType}"));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -14,7 +14,7 @@
|
|||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>U646R5VvTUg8+SGcUCwQINDLr6DcH11tKWUJKn6ZQwI=</dsig:DigestValue>
|
||||
<dsig:DigestValue>9QJYqEhNKmvgEnV3kA7+pYwaTqtyzCv4q+2qds7NPBI=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
@ -53,13 +53,13 @@
|
|||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<file name="AVS.exe" size="21969796">
|
||||
<file name="AVS.exe" size="24333937">
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>DP08gYRmtxcj9ODAGI/o7B8M9suw+HOulaMYfkptXXc=</dsig:DigestValue>
|
||||
<dsig:DigestValue>6S+RtJKmJggrJ8hTRGhQDmxoV+UAJeeo1na1DKrWCiU=</dsig:DigestValue>
|
||||
</hash>
|
||||
</file>
|
||||
</asmv1:assembly>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -14,7 +14,7 @@
|
|||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>U646R5VvTUg8+SGcUCwQINDLr6DcH11tKWUJKn6ZQwI=</dsig:DigestValue>
|
||||
<dsig:DigestValue>9QJYqEhNKmvgEnV3kA7+pYwaTqtyzCv4q+2qds7NPBI=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -53,13 +53,13 @@
|
|||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<file name="AVS.exe" size="21969796">
|
||||
<file name="AVS.exe" size="24333937">
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>DP08gYRmtxcj9ODAGI/o7B8M9suw+HOulaMYfkptXXc=</dsig:DigestValue>
|
||||
<dsig:DigestValue>6S+RtJKmJggrJ8hTRGhQDmxoV+UAJeeo1na1DKrWCiU=</dsig:DigestValue>
|
||||
</hash>
|
||||
</file>
|
||||
</asmv1:assembly>
|
Binary file not shown.
|
@ -57,7 +57,7 @@
|
|||
},
|
||||
"MySql.Data": {
|
||||
"target": "Package",
|
||||
"version": "[8.1.0, )"
|
||||
"version": "[9.3.0, )"
|
||||
},
|
||||
"Newtonsoft.Json": {
|
||||
"target": "Package",
|
||||
|
|
|
@ -4,13 +4,18 @@
|
|||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)system.text.encodings.web\7.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encodings.web\7.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\7.0.1\buildTransitive\netcoreapp2.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.1\buildTransitive\netcoreapp2.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.encodings.web\9.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encodings.web\9.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.io.pipelines\9.0.0\buildTransitive\netcoreapp2.0\System.IO.Pipelines.targets" Condition="Exists('$(NuGetPackageRoot)system.io.pipelines\9.0.0\buildTransitive\netcoreapp2.0\System.IO.Pipelines.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.bcl.asyncinterfaces\9.0.0\buildTransitive\netcoreapp2.0\Microsoft.Bcl.AsyncInterfaces.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.bcl.asyncinterfaces\9.0.0\buildTransitive\netcoreapp2.0\Microsoft.Bcl.AsyncInterfaces.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\9.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\9.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.diagnostics.diagnosticsource\7.0.2\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets" Condition="Exists('$(NuGetPackageRoot)system.diagnostics.diagnosticsource\7.0.2\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.security.permissions\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Permissions.targets" Condition="Exists('$(NuGetPackageRoot)system.security.permissions\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Permissions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.security.cryptography.protecteddata\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.ProtectedData.targets" Condition="Exists('$(NuGetPackageRoot)system.security.cryptography.protecteddata\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.ProtectedData.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.diagnostics.diagnosticsource\8.0.1\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets" Condition="Exists('$(NuGetPackageRoot)system.diagnostics.diagnosticsource\8.0.1\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.codedom\9.0.0\buildTransitive\netcoreapp2.0\System.CodeDom.targets" Condition="Exists('$(NuGetPackageRoot)system.codedom\9.0.0\buildTransitive\netcoreapp2.0\System.CodeDom.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.management\9.0.0\buildTransitive\netcoreapp2.0\System.Management.targets" Condition="Exists('$(NuGetPackageRoot)system.management\9.0.0\buildTransitive\netcoreapp2.0\System.Management.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.io.ports\7.0.0\buildTransitive\netcoreapp2.0\System.IO.Ports.targets" Condition="Exists('$(NuGetPackageRoot)system.io.ports\7.0.0\buildTransitive\netcoreapp2.0\System.IO.Ports.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.configuration.configurationmanager\8.0.0\buildTransitive\netcoreapp2.0\System.Configuration.ConfigurationManager.targets" Condition="Exists('$(NuGetPackageRoot)system.configuration.configurationmanager\8.0.0\buildTransitive\netcoreapp2.0\System.Configuration.ConfigurationManager.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)entityframework\6.4.4\buildTransitive\netcoreapp3.0\EntityFramework.targets" Condition="Exists('$(NuGetPackageRoot)entityframework\6.4.4\buildTransitive\netcoreapp3.0\EntityFramework.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
|
@ -9,7 +9,7 @@
|
|||
<group targetFramework=".NETCoreApp3.1">
|
||||
<dependency id="MaterialSkin" version="0.2.1" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Management.Infrastructure" version="3.0.0" exclude="Build,Analyzers" />
|
||||
<dependency id="MySql.Data" version="8.1.0" exclude="Build,Analyzers" />
|
||||
<dependency id="MySql.Data" version="9.3.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
|
||||
<dependency id="SerialPortStream" version="2.4.1" exclude="Build,Analyzers" />
|
||||
<dependency id="SharpCompress" version="0.38.0" exclude="Build,Analyzers" />
|
||||
|
|
|
@ -17,7 +17,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("AVS")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("AVS")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.1")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.2")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
780de65e10ea97828cb41077d81ed225b0f971cd
|
||||
f8f57b04c9418735bc62e29247d10c70444fa22e
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1 +1 @@
|
|||
952bfb2735d05ec9b79c014d31e167b0141dec43
|
||||
f69833f77b7aabbbd99fd86e876211c79968421a
|
||||
|
|
|
@ -258,6 +258,7 @@ D:\Projects\AVS\bin\Debug\netcoreapp3.1\AVS.runtimeconfig.json
|
|||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\AVS.runtimeconfig.dev.json
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\AVS.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\AVS.pdb
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\BouncyCastle.Cryptography.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\EntityFramework.SqlServer.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\EntityFramework.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\Google.Protobuf.dll
|
||||
|
@ -269,11 +270,11 @@ D:\Projects\AVS\bin\Debug\netcoreapp3.1\Microsoft.Bcl.AsyncInterfaces.dll
|
|||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Logging.Abstractions.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\MySql.Data.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\Newtonsoft.Json.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\BouncyCastle.Crypto.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\RJCP.SerialPortStream.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\SharpCompress.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Data.SQLite.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.CodeDom.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Configuration.ConfigurationManager.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Data.SqlClient.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Data.SQLite.EF6.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Diagnostics.DiagnosticSource.dll
|
||||
|
@ -281,6 +282,10 @@ D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.IO.Pipelines.dll
|
|||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.IO.Ports.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Management.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Runtime.CompilerServices.Unsafe.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Security.AccessControl.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Security.Cryptography.ProtectedData.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Security.Permissions.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Security.Principal.Windows.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Text.Encoding.CodePages.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Text.Encodings.Web.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\System.Text.Json.dll
|
||||
|
@ -314,7 +319,9 @@ D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\win-x64\native\SQLite.Interop.d
|
|||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\win-x86\native\SQLite.Interop.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\unix\lib\netcoreapp2.1\System.Data.SqlClient.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\win\lib\netcoreapp2.1\System.Data.SqlClient.dll
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.csproj.AssemblyReference.cache
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\win\lib\netstandard2.0\System.Security.AccessControl.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\unix\lib\netcoreapp2.1\System.Security.Principal.Windows.dll
|
||||
D:\Projects\AVS\bin\Debug\netcoreapp3.1\runtimes\win\lib\netcoreapp2.1\System.Security.Principal.Windows.dll
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.CartonForm.resources
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.LoginForm.resources
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.MainForm.resources
|
||||
|
@ -328,3 +335,4 @@ D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.csproj.CopyComplete
|
|||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.dll
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.pdb
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.genruntimeconfig.cache
|
||||
D:\Projects\AVS\obj\Debug\netcoreapp3.1\AVS.csproj.AssemblyReference.cache
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -17,7 +17,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("AVS")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("AVS")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.1")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.2")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
f4d77af5f12cec2bb8275fa2c9d3d3a25ea5c62e
|
||||
2bae89042c8b641d43d07eff8fb91bc1381978f1
|
||||
|
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue