This commit is contained in:
@ -90,7 +90,7 @@ namespace Epost.BLL
|
||||
#endregion
|
||||
|
||||
#region 设备检测 查询所有标签
|
||||
public ResultModel GetAllLabelList_M(string batchno)
|
||||
public ResultModel GetAllLabelList_M()
|
||||
{
|
||||
ResultModel model = new ResultModel();
|
||||
try
|
||||
@ -102,7 +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(), batchno);
|
||||
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
|
||||
if (lableDt != null && lableDt.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow labelItem in lableDt.Rows)
|
||||
@ -122,14 +123,20 @@ namespace Epost.BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
|
||||
//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)
|
||||
{
|
||||
shopid = labelItem["shopid"].ToString();
|
||||
if (shopid.Length > 4)
|
||||
{
|
||||
shopid = shopid.Substring(shopid.Length-4,4);
|
||||
}
|
||||
shopid = shopid.Substring(shopid.Length - 4, 4);
|
||||
}
|
||||
|
||||
LabelParamModel lablemodel = new LabelParamModel();
|
||||
lablemodel.Address = labelItem["address"].ToString();
|
||||
lablemodel.ControlIP = item["ControlIP"].ToString();
|
||||
|
Reference in New Issue
Block a user