ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.解决TCP添加失败问题

Browse Source 
2.所有搜索记录倒叙排
3.优化：出入记录、库存记录增加货架类型分类查询
4.权限
5.优化下载app二维码
This commit is contained in:
hehaibing-1996
2024-07-02 09:05:21 +08:00
parent c9e25a1f85
commit adb0367a83
28 changed files with 785 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs
View File

@ -275,6 +275,8 @@ namespace 货架标准上位机.ViewModel
//string secondField = Regex.Match(input, @"{[1-9][0]{2,5}[ ]{").Value;
string secondField = Regex.Match(input, LocalFile.Config.RegexMatQty).Value;
MatQty = Convert.ToInt32(secondField.Replace("{", "").Replace(" ", ""));
input = input.Replace(secondField, string.Empty);
}
catch
{
@ -326,28 +328,35 @@ namespace 货架标准上位机.ViewModel
public void UpdateMatSN()
{
if (MatSNs != null && totalPan > 1)
try
{
MatSNs.Clear();
for (int i = 0; i < TotalPan; i++)
if (MatSNs != null && MatSNs.Count > 0 && totalPan >= 1)
{
var newMatSn = ChangelessCode + MatCode + ReservedCode + MatBatch + (MatBaseInfo.SerialNumber + i).ToString("000");
MatSNs.Add(newMatSn);
}
MatSNs.Clear();
for (int i = 0; i < TotalPan; i++)
{
var newMatSn = ChangelessCode + MatCode + ReservedCode + MatBatch + (MatBaseInfo.SerialNumber + i).ToString("000");
MatSNs.Add(newMatSn);
}
if (MatSNs == null || MatSNs.Count == 0)
{
MatSNsStr = string.Empty;
}
else if (MatSNs.Count == 1)
{
MatSNsStr = MatSNs[0].ToString();
}
else
{
MatSNsStr = MatSNs[0].ToString() + "\r\n~" + MatSNs[MatSNs.Count - 1].ToString();
if (MatSNs == null || MatSNs.Count == 0)
{
MatSNsStr = string.Empty;
}
else if (MatSNs.Count == 1)
{
MatSNsStr = MatSNs[0].ToString();
}
else
{
MatSNsStr = MatSNs[0].ToString() + "~\r\n" + MatSNs[MatSNs.Count - 1].ToString();
}
}
}
catch
{
}
}
public void GenerateMatSN()