hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
jl
2025-06-16 10:32:02 +08:00
parent efe75a69d2
commit 67ec46d1da
5 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Epost.BLL/CommandBLL.cs
View File

@ -90,7 +90,7 @@ namespace Epost.BLL
#endregion
#region 设备检测 查询所有标签
public ResultModel GetAllLabelList_M()
public ResultModel GetAllLabelList_M(string batchno)
{
ResultModel model = new ResultModel();
try
@ -102,8 +102,8 @@ namespace Epost.BLL
{
foreach (DataRow item in dt.Rows)
{
// DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
// DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
if (lableDt != null && lableDt.Rows.Count > 0)
{
foreach (DataRow labelItem in lableDt.Rows)
@ -123,28 +123,34 @@ namespace Epost.BLL
}
else
{
//if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
//{
// shopid = labelItem["shopid"].ToString();
// if (shopid.Length > 4)
// {
// shopid = shopid.Substring(shopid.Length - 4, 4);
// }
//}
if (shopid.Length > 4)
LabelParamModel lablemodel = new LabelParamModel();
if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
{
shopid = shopid.Substring(shopid.Length - 4, 4);
shopid = labelItem["shopid"].ToString();
if (shopid.Length > 3)
{
shopid = shopid.Substring(shopid.Length - 3, 3);
lablemodel.Quantity = shopid;
lablemodel.Mode = "50";
}
}
else {
lablemodel.Quantity = shopid;
lablemodel.Mode = "10";
}
LabelParamModel lablemodel = new LabelParamModel();
lablemodel.Address = labelItem["address"].ToString();
lablemodel.ControlIP = item["ControlIP"].ToString();
lablemodel.Command = "DISPLAY_JOB";
lablemodel.Type = "N";
lablemodel.Quantity = shopid;
lablemodel.Uid = labelItem["address"].ToString();
lablemodel.Mode = "10";
list.Add(lablemodel);
}

4
Epost.BLL/OrderControlBLL.cs
View File

@ -119,10 +119,10 @@ namespace Epost.BLL
#region 设备检测
public ResultModel TestStart()
public ResultModel TestStart(string batchno)
{
ResultModel result = comBLL.GetAllLabelList_M();
ResultModel result = comBLL.GetAllLabelList_M(batchno);
return result;
}