TyroneGit/FATrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初期稳定版本260119

Browse Source
This commit is contained in:
Tyrone CT
2026-01-19 12:40:45 +08:00
parent 82d0bd6b95
commit f65fa21760
32 changed files with 2494 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
FATrace.App/frmMain.cs
View File

@@ -227,9 +227,9 @@ namespace FATrace.App
{
new RawCtrInfo(){
RawName="瑞士乳杆菌GCL1815",
RawCode="DYG05030013",
RawCode="YG05030013",
BtnControlName="btnRawName1",
RawSource=RawSource.China
RawSource=RawSource.Japan
},
new RawCtrInfo(){
RawName="抗性糊精",
@@ -348,7 +348,7 @@ namespace FATrace.App
/// <summary>
/// 当前重量数据
/// </summary>
private double CurWeight { get; set; } = 80.8;
private double CurWeight { get; set; } = 0;
///// <summary>
///// 当前剩余数据
@@ -662,9 +662,27 @@ namespace FATrace.App
return;
}
//确认数据
// 显示消息框，并等待用户响应
DialogResult result = MessageBox.Show("确定要【打印】操作吗？", "确认操作", MessageBoxButtons.OKCancel);
if (result==DialogResult.Cancel)
{
return;
}
if (CurWeight<2.0)
{
//确认数据
// 显示消息框，并等待用户响应
DialogResult resultWeightCheck = MessageBox.Show("检测到当前的重量小于2g，确定要【打印】操作吗？", "确认操作", MessageBoxButtons.OKCancel);
if (resultWeightCheck == DialogResult.Cancel)
{
return;
}
}
//新的剩余重量 Kg
var NewRemainWeight = CurSelectedRawProInput.RemainWeight - CurWeight / 1000;
var NewRemainWeight = CurSelectedRawProInput.RemainWeight - CurWeight / 1000.0;
//当前产品的剩余重量
txtRemainWeight.Text = NewRemainWeight.ToString();
@@ -767,6 +785,16 @@ namespace FATrace.App
}
}
/// <summary>
/// 格式化重量显示，整数部分至少2位（不足补0），小数部分固定2位
/// </summary>
/// <param name="weight">原始重量值</param>
/// <returns>格式化后的重量字符串（如：09.50, 81.10, 100.00）</returns>
private string FormatWeight(double weight)
{
return weight.ToString("00.00");
}
/// <summary>
/// 获取当前的日产量信息
/// </summary>
@@ -849,7 +877,7 @@ namespace FATrace.App
Code.Append(',');
Code.Append(Batch);
Code.Append(',');
Code.Append(Weight.ToString().Replace(".", ""));
Code.Append(FormatWeight(Weight).ToString().Replace(".", ""));
Code.Append(',');
Code.Append(ShelfLife.ToString());
Code.Append(',');
@@ -950,17 +978,20 @@ namespace FATrace.App
return;
}
var ListUser = FSqlContext.FDb.Select<TbUser>().Where(a => a.UserName == txtCheckUserName.Text.Trim()).ToList();
var ListUser = FSqlContext.FDb.Select<TbWeightUser>()
.Where(a => a.CheckName == txtCheckUserName.Text.Trim() && a.OpName == txtOpName.Text.Trim())
.ToList();
if (ListUser != null && ListUser.Count() > 0)
{
if (ListUser.FirstOrDefault().Password == txtPassword.Text.Trim())
{
MessageBox.Show("登录成功！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
Main_PopUserNameEvent(txtCheckUserName.Text.Trim(), txtOpName.Text.Trim(), ListUser.FirstOrDefault().AccessLevel);
Main_PopUserNameEvent(txtCheckUserName.Text.Trim(), txtOpName.Text.Trim(), "称重用户");
this.TabControlMain.SelectedIndex = 0;
txtCheckUserName.Text = "";
txtOpName.Text = "";
txtPassword.Text = "";
//PopUserNameEvent(txtUserName.Text.Trim());
//this.Close();